X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=3a_asm%2FDT.hs;h=c80186ca399447d171e1eae70e7f17f99427f9ee;hb=c45536d352d3a45f6bbc7627c8bd5d0163ba054e;hp=8696ebe145b23dd3e3dabe8b2f57341226497fe6;hpb=79de90a76b7822145fcc57f45afb83ac34225bbf;p=calu.git diff --git a/3a_asm/DT.hs b/3a_asm/DT.hs index 8696ebe..c80186c 100644 --- a/3a_asm/DT.hs +++ b/3a_asm/DT.hs @@ -17,12 +17,12 @@ import Control.Applicative hiding ((<|>)) -- parsing -- -instruction :: Dict -> Parser Word32 -instruction dict = foldl1 (<|>) (fmap (\x -> try (x dict)) instructions) <* char '\n' +instruction :: LineNo -> Dict -> Parser Word32 +instruction lno dict = foldl1 (<|>) (fmap (\x -> try (x dict)) instructions) <* char '\n' (". something at line " ++ show lno ++ " is wrong (ignore line 1 hint above, but pay attention for possible line offset due to #include).") testins :: String -> IO () testins input = - case (parse (instruction dict) "" (input++"\n")) of + case (parse (instruction 0 dict) "" (input++"\n")) of Left err -> do { putStr "fail :/\n"; print err} Right x -> do { printf "0x%08X\n" x } where @@ -38,6 +38,7 @@ iLabel d@(aktadr,_) = do {i <- (iLit d); return $ ((i - aktadr)`div`4) .&. 0xfff iLit :: Dict -> Parser Word32 iLit (_,d) = do + parseMySpaces val <- expr d; try (do { string "@hi"; parseMySpaces; @@ -70,21 +71,15 @@ condition = do let (Just ret) = lookup str conds return $ ret -hlcondition :: Parser (Word32,Word32) -hlcondition = try(do { - c1 <- condition; - return $ (0,c1) - }) <|> do { - hl <- highlow; c <- condition; - return $ (hl,c) - } "DO NOT USE ldil (you can skip 'l' [low], since it is default)" - carry :: Parser Word32 carry = do { char 'c'; return 1} <|> do {string ""; return 0} updateDisable :: Parser Word32 updateDisable = do { char 'd'; return 1} <|> do {string ""; return 0} +highonly :: Parser Word32 +highonly = do { char 'h'; return 1} <|> do {string ""; return 0} + highlow :: Parser Word32 highlow = do { char 'h'; return 1} <|> do {char 'l'; return 0} <|> do {string ""; return 0} @@ -117,6 +112,7 @@ ins m form e = do {mnem m; form e} csv0i_p dict f = f<$>condition<*>branchpred<*>(iLabel dict) csv0i_p' f = f<$>condition<*>branchpred csv1 f = f<$>condition<%>reg +csv1' f = f<$>condition csv1_p f = f<$>condition<%>reg csv2 f = f<$>condition<%>reg<.>reg csv2i dict f = f<$>condition<%>reg<.>(iLit16 dict) @@ -125,7 +121,8 @@ csv2m dict f = f<$>condition<%>reg<.>(iLit15 dict)<@>reg csv2i_cd dict f = f<$>carry<*>updateDisable<*>condition<%>reg<.>reg<.>(iLit5 dict) csv2i_d dict f = f<$>updateDisable<*>condition<%>reg<.>reg<.>(iLit5 dict) csv2i_scd dict f = f<$>sign<*>carry<*>updateDisable<*>condition<%>reg<.>reg<.>(iLit12 dict) -csv2i_sl dict f = f<$>sign<*>hlcondition<%>reg<.>(iLit16 dict) +csv2i_sl dict f = f<$>highonly<*>sign<*>condition<%>reg<.>(iLit16 dict) +csv2i_sl' dict f = f<$>sign<*>condition<%>reg<.>(iLit16 dict) csv2i_lfd dict f = f<$>highlow<*>fill<*>updateDisable<*>condition<%>reg<.>(iLit16 dict) csv3_cd f = f<$>carry<*>updateDisable<*>condition<%>reg<.>reg<.>reg csv3_d f = f<$>updateDisable<*>condition<%>reg<.>reg<.>reg @@ -135,7 +132,7 @@ instructions = [add, addi, mov, sub, subi, lls, lrs, ars, pop, push, disc, fetch, movpf, movsf, movpt, movst, - ldh, ldb, ldw, ldi, + ldh, ldb, ldw, ldi, ldil, stw, sth, stb, ldx, stx, br, ret, call, reti, @@ -162,7 +159,7 @@ lrs dict = ins "lrs" (csv2i_cd dict) $ shiform 0x0a 1 0 ars dict = ins "ars" (csv2i_d dict) $ shiform 0x0a 1 1 0 -- memory pop _ = ins "pop" csv1 $ sform 0x0b 0x0 -disc _ = ins "disc" csv1 $ sform 0x0b 0x1 +disc _ = ins "disc" csv1' $ sform' 0x0b 0x1 0 fetch _ = ins "fetch" csv1 $ sform 0x0b 0x2 push _ = ins "push" csv1 $ sform 0x0b 0x3 movpf _ = ins "movpf" csv1 $ sform 0x0c 0x2 @@ -173,6 +170,7 @@ ldw dict = ins "ldw" (csv2m dict) $ mformi 0x0e ldh dict = ins "ldh" (csv2m dict) $ mformi 0x10 ldb dict = ins "ldb" (csv2m dict) $ mformi 0x12 ldi dict = ins "ldi" (csv2i_sl dict) $ lformi' 0x1a +ldil dict = ins "ldil" (csv2i_sl' dict) $ lformi' 0x1a 0 stw dict = ins "stw" (csv2m dict) $ mformi 0x0f sth dict = ins "sth" (csv2m dict) $ mformi 0x11 stb dict = ins "stb" (csv2m dict) $ mformi 0x13 @@ -197,8 +195,8 @@ aformi opcd s c d cond rd ra imm = pack [(cond,28),(opcd,23),(rd,19),(ra,15),(im aformi' opcd s c d cond rd ra = aformi opcd s c d cond rd ra 0 lformi opcd hl f d cond rd imm = pack [(cond,28),(opcd,23),(rd,19),(imm,3),(hl,2),(f,1),(d,0)] -lformi' opcd s (hl,cond) rd imm = lformi opcd s hl 0 cond rd imm -lformi'not opcd cond rd = lformi opcd 0 1 0 cond rd 0xefffffff +lformi' opcd hl s cond rd imm = lformi opcd s hl 0 cond rd imm +lformi'not opcd cond rd = lformi opcd 0 1 0 cond rd 0xffff mformi opcd cond rd disp ra = pack [(cond,28),(opcd,23),(rd,19),(ra,15),(disp,0)] mformi' opcd cond rd = mformi opcd cond rd 0 @@ -208,35 +206,12 @@ bform opcd typ s cond bp imm = pack [(cond,28),(opcd,23),(imm,7),(free,4),(typ,2 bform' opcd typ cond bp = bform opcd typ 0 cond bp 0 sform opcd typ cond rd = pack [(cond,28),(opcd,23),(rd,19),(typ,17)] +sform' opcd typ rd cond = sform opcd typ cond rd brrform opcd typ cond ra = pack [(cond,28),(opcd,23),(ra,19),(typ,2)] shiform opcd lr a c d cond rd ra imm = pack [(cond,28),(opcd,23),(rd,19),(ra,15),(imm,10),(lr,3),(a,2),(c,1),(d,0)] --- ppc64 stuff (TODO: remove) -iform opcd aa lk li = pack [(opcd,6),(li,30),(aa,31),(lk,0)] -scform opcd lev = pack [(opcd,6),(lev,27),(1,31)] -dform'b opcd bf l ra si = pack [(opcd,6),(bf,9),(0,10),(l,11),(ra,16),(si,0)] -dsform opcd rt ra ds xo = pack [(opcd,6),(rt,11),(ra,16),(ds,30),(xo,0)] -xform'a opcd rt ra rb xo = pack [(opcd,6),(rt,11),(ra,16),(rb,21),(xo,31)] -xform'b opcd xo bf l ra rb = pack [(opcd,6),(bf,9),(0,10),(l,11),(ra,16),(rb,21),(xo,31),(0,0)] -xform'c opcd xo rs ra rb rc = pack [(opcd,6),(rs,11),(ra,16),(rb,21),(xo,31),(rc,0)] -xform'd opcd xo rc rs ra = pack [(opcd,6),(rs,11),(ra,16),(0,21),(xo,31),(rc,0)] -xlform'a opcd xo bt ba bb = pack [(opcd,6),(bt,11),(ba,16),(bb,21),(xo,31)] -xlform'b opcd xo lk bo bi bh = pack [(opcd,6),(bo,11),(bi,16),(bh,21),(xo,31),(lk,0)] -xlform'c opcd xo bf bfa = pack [(opcd,6),(bf,9),(bfa,14),(xo,31)] -xfxform opcd xo rs spr = pack [(opcd,6),(rs,11),(spr,21),(xo,31)] -xfxform'b opcd h xo fxm rs = pack [(opcd,6),(rs,11),(h,12),(fxm,20),(xo,31)] ---xflform --- fix xsform -xsform opcd xo rc ra rs sh = pack [(opcd,6),(rs,11),(ra,16),(sh,21),(xo,30),(sh,31),(rc,0)] -xoform' opcd xo oe rc rt ra = pack [(opcd,6),(rt,11),(ra,16),(0,21),(oe,22),(xo,31),(rc,0)] ---aform -mform opcd rc ra rs sh mb me = pack [(opcd,6),(rs,11),(ra,16),(sh,21),(mb,26),(me,31),(rc,0)] --- mdform needs to be fixed to handle sh correctly -mdform opcd h rc ra rs sh mb = pack [(opcd,6),(rs,11),(ra,16),(sh,21),(mb,27),(h,30),(sh,31),(rc,0)] -mdsform opcd h rc ra rs rb mb = pack [(opcd,6),(rs,11),(ra,16),(rb,21),(mb,27),(h,31),(rc,0)] - -- bit-packing -- pack bf = foldr1 (.|.) $ map (uncurry rotateL) bf