3a_asm: more .fill power and better 'make test' target

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

diff --git a/3a_asm/Main.hs b/3a_asm/Main.hs
index 2e99807e06f0cf10a41347045dcf3d427becbeb3..f3a6fc11d0681aac60ad2bb9bb8d05a8d82df96a 100644 (file)
--- a/3a_asm/Main.hs
+++ b/3a_asm/Main.hs
@@ -58,6 +58,13 @@ convertDTF ((lno,str):xs) state datacnt instrcnt dict = (newdict, (actlist newdt
        actlist (DTF_Org _) = next
        actlist (DTF_State _) = next
        actlist (DTF_Define _ _ _) = next
+       actlist (DTF_Fill rep val code l c) = if state == InData then
+               (DTF_Data datacnt val code l c):[(DTF_Data dc val "" "" "") | i<-[2..repi], let dc = [(datacnt+0x4),(datacnt+0x8)..]!!(i-2)] ++ next
+               else
+               (DTF_Instr instrcnt val code l c):[(DTF_Instr ic val "" "" "") | i<-[2..repi], let ic = [(instrcnt+0x4),(instrcnt+0x8)..]!!(i-2)] ++ next
+               where
+               repi :: Int
+               repi = fromInteger (toInteger rep)
        actlist y = y:next
 
        (newdict,next) = convertDTF xs (nstate newdtf) (ndatacnt newdtf) (ninstrcnt newdtf) (ndict newdtf)
@@ -65,12 +72,18 @@ convertDTF ((lno,str):xs) state datacnt instrcnt dict = (newdict, (actlist newdt
        ndatacnt (DTF_Org adr)
                | state == InData = adr
                | otherwise = datacnt
+       ndatacnt (DTF_Fill rep _ _ _ _)
+               | state == InData = datacnt + (4*rep)
+               | otherwise = datacnt
        ndatacnt (DTF_Data _ _ _ _ _) = inc datacnt
        ndatacnt _ = datacnt
 
        ninstrcnt (DTF_Org adr)
                | state == InText = adr
                | otherwise = instrcnt
+       ninstrcnt (DTF_Fill rep _ _ _ _)
+               | state == InText = instrcnt + (4*rep)
+               | otherwise = instrcnt
        ninstrcnt (DTF_Instr _ _ _ _ _) = inc instrcnt
        ninstrcnt (DTF_InstrToParse _ _ _ _ _) = inc instrcnt
        ninstrcnt _ = instrcnt
@@ -84,6 +97,9 @@ convertDTF ((lno,str):xs) state datacnt instrcnt dict = (newdict, (actlist newdt
        ndict (DTF_Data a _ _ l _) = dict `add_elem` (l,a)
        ndict (DTF_Instr a _ _ l _) = dict `add_elem` (l,a)
        ndict (DTF_Define l v _) = dict `add_elem` (l,v)
+       ndict (DTF_Fill _ _ _ l _)
+               | state == InText = dict `add_elem` (l,instrcnt)
+               | state == InData = dict `add_elem` (l,datacnt)
        ndict _ = dict
 
        newdtf = case (parse (parseDTFLine dict) "" (str++"\n")) of
@@ -104,7 +120,7 @@ convertDTF ((lno,str):xs) state datacnt instrcnt dict = (newdict, (actlist newdt
                                NoState -> error "missing .data or .text"
                                InData -> (DTF_Label l c datacnt)
                                InText -> (DTF_Label l c instrcnt)
-               Right z -> z -- DTF_Comment, DTF_State, DTF_Define
+               Right z -> z -- DTF_Comment, DTF_State, DTF_Define, DTF_Fill
 
 
 
@@ -149,12 +165,14 @@ lf_data d = do
        l <- try (parseLabel) <|> string ""
        skipMany space
        fill <- string ".fill "
+       repeat <- try (do {size <- many1 $ noneOf "\n;,"; char ','; return $ size}) <|> return "1"
        -- TODO: atm 32bit imm only
        code <- many1 $ noneOf "\n;"
        -- TODO: this is quite ugly here :/
        let (Right val) = parse (parseConst d) "" code
+       let (Right r) = parse (parseConst d) "" repeat
        comment <- try(parseComment) <|> parseMySpaces
-       return $ DTF_SectionToDet 0 val (fill ++ code) l comment
+       return $ DTF_Fill r val (fill ++ (if repeat == "1" then "" else repeat) ++ code) l comment
 
 lf_comment _ = do
        comment <- parseComment