3a_asm: .ascii directive

[calu.git] / 3a_asm / DTFormat.hs

diff --git a/3a_asm/DTFormat.hs b/3a_asm/DTFormat.hs
index 3e607fdec50803ccd2ad8f7758e044d798ac9af1..17b2f014c8bc737dab587f75dc2bfbcabff301ce 100644 (file)
--- a/3a_asm/DTFormat.hs
+++ b/3a_asm/DTFormat.hs
@@ -1,20 +1,27 @@
 module DTFormat where
 
+import Numeric
 import Data.Word
+import Data.Char
 import Text.Printf
 import Text.Parsec
 import Text.Parsec.String
 import Text.Parsec.Combinator
+import Text.Parsec.Expr
+import Text.ParserCombinators.Parsec.Token
+import Text.ParserCombinators.Parsec.Expr
 import Control.Monad
 
 data DT_State = NoState | InData | InText deriving (Show,Eq)
 
 type Address = Word32
 type Value = Word32
+type Repeat = Word32
 type ValueToParse = String
 type Code = String
 type Label = String
 type Comment = String
+type Ascii = String
 
 data DTF =
        DTF_Data Address Value Code Label Comment | -- 0;...
@@ -26,6 +33,8 @@ data DTF =
        DTF_SectionToDet Address Value Code Label Comment |
        DTF_Org Address |
        DTF_Define Label Value Comment |
+       DTF_Fill Repeat Value Label Code Comment |
+       DTF_Ascii String Label Code Comment |
        DTF_State DT_State
 
 instance Show (DTF) where
@@ -39,12 +48,24 @@ showsDTF (DTF_Label l c _) = (++) (printf "3;%s;%s\n" l c)
 showsDTF (DTF_InstrToParse a v c l s) = (++) (printf "itp;%08x;%s;%s;%s;%s\n" a v c l s)
 showsDTF (DTF_SectionToDet a v c l s) = (++) (datins "std" a v c l s)
 showsDTF (DTF_Org a) = (++) (printf "org;%08x\n" a)
-showsDTF (DTF_Define l a c) = (++) (printf "def;%s;%08X;%s\n" l a c)
+showsDTF (DTF_Define l a c) = (++) (printf "def;%s;%08x;%s\n" l a c)
+showsDTF (DTF_Fill r v code l c) = (++) (printf "fill;%08x;%08x;%s;%s;%s\n" r v code l c)
+showsDTF (DTF_Ascii str l code c) = (++) (printf "ascii;%s;%s;%s;%s" str code l c)
 showsDTF (DTF_State s) = (++) (printf "sta;%s\n" (show s))
 
 datins :: String -> Address -> Value -> Code -> Label -> Comment -> String
 datins = printf "%s;%08x;%08x;%s;%s;%s\n"
 
+tobin :: Value -> String
+tobin v = reverse $ take 32 $ reverse $ (['0' | _<-[0..32]]) ++ (showIntAtBase 2 (chr. ((+)0x30)) v "")
+
+showsDTFBase :: DTF -> Int -> ShowS
+showsDTFBase (DTF_Data a v c l s) 2 = (++) (datinsBin "0" a (tobin v) c l s)
+showsDTFBase (DTF_Instr a v c l s) 2 = (++) (datinsBin "1" a (tobin v) c l s)
+showsDTFBase d _ = showsDTF d
+
+datinsBin :: String -> Address -> String -> Code -> Label -> Comment -> String
+datinsBin = printf "%s;%08x;%s;%s;%s;%s\n"
 
 -- datastructure for managing labels and defines
 type Dict = (Address,[DictElem])