3a_asm: 'nicer' fix for ldil vs. ldilt fail

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

diff --git a/3a_asm/Main.hs b/3a_asm/Main.hs
index f3a6fc11d0681aac60ad2bb9bb8d05a8d82df96a..8160012fd09585ae1191b745804bcb996c57e596 100644 (file)
--- a/3a_asm/Main.hs
+++ b/3a_asm/Main.hs
@@ -1,6 +1,6 @@
 -- as for deep thoughts ISA
 -----------------------------------------------------------------------------
-import DT
+import DT hiding (not)
 import DTFormat
 import Expr_eval
 
@@ -25,13 +25,18 @@ main = do
        content <- getContents
        let src = (filter (((/=) "") . snd) $ (zip [1..] (lines content)))
        let (dict,formatedsrc) = convertDTF src NoState 0x00 0x00 [("start_",0x00)]
-       printf "\nlabels:\n"
-       sequence_ [printf "%20s @ 0x%08x\n" l a | (l,a) <- (reverse dict)]
-       printf "\nparsed asm:\n"
-       sequence_ [printf "%s" (show x) | x <- formatedsrc]
+       if (not $ null args) && ("-d" `elem` args)
+               then do
+                       printf "\nlabels:\n"
+                       sequence_ [printf "%20s @ 0x%08x\n" l a | (l,a) <- (reverse dict)]
+                       printf "\nparsed asm:\n"
+                       sequence_ [printf "%s" (show x) | x <- formatedsrc]
+                       printf "\nafter parsing the instructions:\n"
+               else do
+                       printf ""
+       let base = if "-b" `elem` args then 2 else 16
        let parsed = parseInstr dict formatedsrc
-       printf "\nafter parsing the instructions:\n"
-       sequence_ [printf "%s" (show x) | x <- parsed]
+       sequence_ [printf "%s" (showsDTFBase x base "") | x <- parsed]
 
 
 parseInstr :: [DictElem] -> [DTF] -> [DTF]
@@ -168,9 +173,12 @@ lf_data d = do
        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
+       let val = case parse (parseConst d) "" code of
+               Right v -> v
+               Left err -> error $ show err
+       let r = case parse (parseConst d) "" repeat of
+               Right v -> v
+               Left err -> error $ show err
        comment <- try(parseComment) <|> parseMySpaces
        return $ DTF_Fill r val (fill ++ (if repeat == "1" then "" else repeat) ++ code) l comment