[vm] wrong order of input + minibug

[calu.git] / 8_benchs / src / vm.s

diff --git a/8_benchs/src/vm.s b/8_benchs/src/vm.s
index 784dc93cdc101d6d6243221833e00b25b55788d4..c9b7e04adf258359a49672beb049afe720bea392 100644 (file)
--- a/8_benchs/src/vm.s
+++ b/8_benchs/src/vm.s
@@ -1,71 +1,37 @@
 .data
 .org 0x10
 inputdata:
-;4 8 * 8
-.fill 1, 0x34382A38
+;8 * 8 4
+.fill 1, 0x382A3834
 ;8 * X 1
 .fill 1, 0x382A5831
+;1 X * 8
+.fill 1, 0x31582A38
 ;- X D +
 .fill 1, 0x2D58442B
-;D J \xF8 P
-.fill 1, 0x444AF850
+;+ D X -
+.fill 1, 0x2B44582D
+;P \xF8 J D
+.fill 1, 0x50F84A44
 ;6 8 * +
 .fill 1, 0x36382A2B
+;+ * 8 6
+.fill 1, 0x2B2A3836
 ;D I \020 \000
 .fill 1, 0x44492000
+;\000 \020 I D
+.fill 1, 0x00204944
 ;\000 \000 < ~
 .fill 1, 0x00003C7E
-;J \005 P 8
-.fill 1, 0x4A055038
-;8 *
-.fill 1, 0x382A
+;~ < \000 \000
+.fill 1, 0x7E3C0000
+;8 P \005 J
+.fill 1, 0x3850054A
+;* 8
+.fill 1, 0x2A38
 
 stack:
 .fill 256, 0
-jumptable:
-;0
-.fill 0, vm_eof
-.fill 40, vm_default
-;42
-.fill 1, vm_mul
-;43
-.fill 1, vm_add
-;44
-.fill 1, vm_default
-;45
-.fill 1, vm_sub
-;46-47
-.fill 2, vm_default
-;48-57
-.fill 10, vm_consts
-;58-59
-.fill 2, vm_default
-;60
-.fill 1, vm_lessthan
-;61-67
-.fill 7, vm_default
-;68
-.fill 1, vm_dup
-;69-72
-.fill 4, vm_default
-;73
-.fill 1, vm_imm
-;74
-.fill 1, vm_jmp
-;75-79
-.fill 5, vm_default
-;80
-.fill 1, vm_pop
-;81-87
-.fill 7, vm_default
-;88
-.fill 1, vm_xch
-;88-125
-.fill 40, vm_default
-;126
-.fill 1, vm_not
-;127-255
-.fill 129, vm_default
 
 .text
 main:
@@ -92,7 +58,7 @@ vm_loop:
        ;generate effective input addr
        add r4, r1, r2
        ;load input
-       ldw r5, 0(r4)
+       ldb r5, 0(r4)
        ;jump to instr
        brr r5
 
@@ -104,6 +70,36 @@ vm_eof:
 ;case *
 ;42
 vm_mul:
+       ;decrement sp
+       subi r3, r3, 4
+       ;load sp
+       ldw r6, 0(r3)
+       ;load sp-1
+       ldw r7, 0-4(r3)
+
+       ;return init
+       ldis r8, 0  
+       ;save of sp-1
+       mov r7, r0
+       ;check if sp-1 is even or odd
+       andx r0, 1
+       ;add sp to result
+       adddnz r8, r8, r6
+       ;if odd decrement sp-1
+       subinz r7, r7, 1
+       ;just to get zero flag unset
+       addizs r7, r7, 0
+loop:
+       ;if last was not zero
+       ;add to sp-1 to result
+       adddnz r8, r8, r6
+       adddnz r8, r8, r6
+       ;decrement sp-1 by 2
+       subi r7, r7, 2
+       ;jump if not zero
+       brnz+ loop
+       ;save result
+       stw r8, 0-4(r3)
        br+ vm_loop
 
 ;case +
@@ -165,7 +161,6 @@ vm_lessthan:
        ;store r8 to sp-1
        stw r8, 0-4(r3)
        br+ vm_loop
-       
 
 ;case D
 ;68
@@ -182,23 +177,23 @@ vm_dup:
 ;73
 vm_imm:
        ;load new high byte
-       ldb r6, 4(pc)
+       ldb r6, 4(r2)
        ;shift high byte
        lls r6, r6, 8
        ;load 2nd byte
-       ldb r7, 3(pc)
+       ldb r7, 3(r2)
        ;add to high byte
        add r6, r6, r7
        ;shift
        lls r6, r6, 8
        ;load
-       ldb r7, 2(pc)
+       ldb r7, 2(r2)
        ;add
        add r6, r6, r7
        ;shift
        lls r6, r6, 8
        ;load
-       ldb r7, 1(pc)
+       ldb r7, 1(r2)
        ;add
        add r6, r6, r7
        ;store result to stack
@@ -211,13 +206,13 @@ vm_imm:
 ;74
 vm_jmp:
        ;decrement sp
-       sub r3, r3, 4
+       subi r3, r3, 4
        ;load sp
        ldw r6, 0(r3)
        ;compare to 0
        cmpi r6,0
        ;increment pc if == 0
-       addieqD r2, r2, 4
+       addideq r2, r2, 4
        brnq+ vm_loop
        ;if != 0
        ;load pc+1 input
@@ -253,3 +248,49 @@ vm_not:
        not r6
        stw r6, 0-4(r3)
        br+ vm_loop
+
+.data
+jumptable:
+;0
+.fill 0, vm_eof
+.fill 40, vm_default
+;42
+.fill 1, vm_mul
+;43
+.fill 1, vm_add
+;44
+.fill 1, vm_default
+;45
+.fill 1, vm_sub
+;46-47
+.fill 2, vm_default
+;48-57
+.fill 10, vm_consts
+;58-59
+.fill 2, vm_default
+;60
+.fill 1, vm_lessthan
+;61-67
+.fill 7, vm_default
+;68
+.fill 1, vm_dup
+;69-72
+.fill 4, vm_default
+;73
+.fill 1, vm_imm
+;74
+.fill 1, vm_jmp
+;75-79
+.fill 5, vm_default
+;80
+.fill 1, vm_pop
+;81-87
+.fill 7, vm_default
+;88
+.fill 1, vm_xch
+;88-125
+.fill 40, vm_default
+;126
+.fill 1, vm_not
+;127-255
+.fill 129, vm_default