X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=3a_asm%2FDTFormat.hs;h=fa1ddb1571e3bfacc8297155fc552c6485fa615f;hb=c45536d352d3a45f6bbc7627c8bd5d0163ba054e;hp=1c8d809331478d002696eef2db6e25cf73e3d2f7;hpb=1a5edb9509baec96133668773da0f7ad8de75e2a;p=calu.git

diff --git a/3a_asm/DTFormat.hs b/3a_asm/DTFormat.hs
index 1c8d809..fa1ddb1 100644
--- a/3a_asm/DTFormat.hs
+++ b/3a_asm/DTFormat.hs
@@ -1,26 +1,41 @@
 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
+type LineNo = Word32
 
 data DTF =
-	DTF_Data Address Value Code Label Comment |
-	DTF_Instr Address Value Code Label Comment |
-	DTF_Comment Comment |
-	DTF_Label Label Comment Address |
+	DTF_Data Address Value Code Label Comment | -- 0;...
+	DTF_Instr Address Value Code Label Comment | -- 1;...
+	DTF_Comment Comment | -- 2;...
+	DTF_Label Label Comment Address | -- 3;...
 	-- types for intern processing
-	DTF_InstrToParse Address ValueToParse Code Label Comment |
+	DTF_InstrToParse Address ValueToParse Code Label Comment LineNo |
 	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
@@ -31,11 +46,49 @@ showsDTF (DTF_Data a v c l s) = (++) (datins "0" a v c l s)
 showsDTF (DTF_Instr a v c l s) = (++) (datins "1" a v c l s)
 showsDTF (DTF_Comment c) = (++) (printf "2;%s\n" c)
 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_InstrToParse a v c l s lno) = (++) (printf "itp;%08x;%s;%s;%s;%s@%d\n" a v c l s lno)
 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_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])
+type DictElem = (String,Word32)
+
+get_elem :: String -> [DictElem] -> Word32
+get_elem s dict = case (lookup s dict) of
+		Nothing -> error ("unknown label or define: \"" ++ s ++ "\"")
+		Just z -> z
+
+add_elem :: [DictElem] -> (String,Word32) -> [DictElem]
+add_elem dic (s,w)
+	| s == "" = dic -- ignore empty string
+	| already_in =  error ("Label or define \"" ++ s ++ "\" already exists")
+	| otherwise = (s,w):dic
+	where
+	already_in = case (lookup s dic) of
+		Just _ -> True
+		Nothing -> False
+
+-- some common functions
+parseMySpaces :: Parser String
+parseMySpaces = do
+	ret <- many $ oneOf "\t "
+	return $ ret