3a_asm: divide the computed address with four at br and call

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

diff --git a/3a_asm/DT.hs b/3a_asm/DT.hs
index e2727b451773df6d9e793f4ffb8ab60e532f3900..562285ba8c2d621e1febecb46f81cb4876218ba0 100644 (file)
--- a/3a_asm/DT.hs
+++ b/3a_asm/DT.hs
@@ -32,6 +32,10 @@ testins input =
 comma = char ','
 mnem m = string m
 
+iLabel :: Dict -> Parser Word32
+-- TODO: save msb (=sign) correctly...
+iLabel d@(aktadr,_) = do {i <- (iLit d); return $ ((i - aktadr)`div`4) .&. 0xffff}
+
 iLit :: Dict -> Parser Word32
 iLit (_,d) = do
        val <- expr d;
@@ -46,7 +50,7 @@ iLit (_,d) = do
 
 iLit5  d = do i <- iLit d; return $ i .&. 0x001f
 iLit12 d = do i <- iLit d; return $ i .&. 0x0fff
-iLit15 d = do i <- iLit d; return $ i .&. 0xefff
+iLit15 d = do i <- iLit d; return $ i .&. 0x7fff
 iLit16 d = do i <- iLit d; return $ i .&. 0xffff
 
 imm4 :: Parser String
@@ -101,7 +105,7 @@ infixl 1 <%>
 infixl 1 <@>
 
 ins m form e  = do {mnem m; form e}
-csv0i_p dict f = f<$>condition<*>branchpred<*>(iLit dict)
+csv0i_p dict f = f<$>condition<*>branchpred<*>(iLabel dict)
 csv0i_p' f = f<$>condition<*>branchpred
 csv1 f = f<$>condition<%>reg
 csv1_p f = f<$>condition<%>reg
@@ -194,7 +198,7 @@ bform opcd typ s cond bp imm = pack [(cond,28),(opcd,23),(imm,7),(free,4),(typ,2
        where free = 0
 bform' opcd typ cond bp = bform opcd typ 0 cond bp 0
 
-sform opcd typ rd cond = pack [(cond,28),(opcd,23),(rd,19),(typ,17)]
+sform opcd typ cond rd = pack [(cond,28),(opcd,23),(rd,19),(typ,17)]
 
 brrform opcd typ cond ra = pack [(cond,28),(opcd,23),(ra,19),(typ,2)]