X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=calu.git;a=blobdiff_plain;f=3a_asm%2FDT.hs;h=213a5c381763458c02ae842d707d1954d8b1a479;hp=e065c71c16129d5ee2f66d3ed92f023492ce5486;hb=48de8a90471559126c929bc7253e6edf34da28fa;hpb=2c106febdc5883442ffc4341933e1bd23829df4a

diff --git a/3a_asm/DT.hs b/3a_asm/DT.hs
index e065c71..213a5c3 100644
--- a/3a_asm/DT.hs
+++ b/3a_asm/DT.hs
@@ -111,6 +111,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)
@@ -157,7 +158,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
@@ -204,6 +205,7 @@ 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)]