3a_asm: FIX: parser fail bei labels aufloesen

[calu.git] / progs / deepjit.s

diff --git a/progs/deepjit.s b/progs/deepjit.s
index 97008f9da9ec1ebf37fc37e2345ad2e00c83551a..1436b63c6048139336aca09894acb6415eeb58d8 100644 (file)
--- a/progs/deepjit.s
+++ b/progs/deepjit.s
@@ -89,7 +89,7 @@ prog_imm:
 .ifill push r6
 
 prog_pop:
-.ifill disc r6
+.ifill disc
 
 prog_xch:
 .ifill pop r6
@@ -114,6 +114,11 @@ prog_not:
        .define PBASE, 0x2030
        .define PADDR, 0x4
        .define PDATA, 0x8
+.org 0
+start:
+       call main
+       call main
+       ret
 
 
 main:
@@ -135,13 +140,15 @@ u_test:
        brnz+ u_test ; branch if not zero
        stb r0, UART_TRANS(r10)
 
+
        ;set address of input
        ldis r1, inputdata@lo
        ldih r1, inputdata@hi
 
+
        ;set address of program start
-       ldis r2, prog_start@lo
-       ldih r2, prog_start@hi
+       ldis r2, (prog_start/4)@lo
+       ldih r2, (prog_start/4)@hi
 
        ;set address to instruction table
        ldis r3, instrtable@lo
@@ -154,6 +161,7 @@ u_test:
        ldis r13, PBASE@lo
        ldih r13, PBASE@hi
 
+
        ;set programmer address
        stw r2, PADDR(r13)
 
@@ -177,10 +185,10 @@ u_test:
        ldi  r10, UART_BASE@lo
        ldih r10, UART_BASE@hi
 
-u_send_by1:
+u_send_byte1:
        ldw r9, UART_STATUS(r10)
        andx r9, UART_TRANS_EMPTY
-       brnz+ u_send_by1 ; branch if not zero
+       brnz+ u_send_byte1 ; branch if not zero
        ldis r0, 0x50
        stb r0, UART_TRANS(r10)
 
@@ -271,7 +279,7 @@ vm_defer:
 
        ;generate branch
        sub r11, r6, r8
-       lrs r11, r11, 2
+       ;lrs r11, r11, 2
        ;set the upper 16 bit 0
        andx r11, 0xFFFF
        ;shift to the position of imm in br
@@ -318,7 +326,7 @@ vm_mul:
        PROGINSTR
 
        ;increment address
-       addi r2, r2, 52
+       addi r2, r2, 13
 
        br+ vm_loop
 
@@ -340,7 +348,7 @@ vm_add:
        PROGINSTR
 
        ;increment address
-       addi r2, r2, 16
+       addi r2, r2, 4
 
        br+ vm_loop
 
@@ -362,7 +370,7 @@ vm_sub:
        PROGINSTR
 
        ;increment address
-       addi r2, r2, 16
+       addi r2, r2, 4
 
        br+ vm_loop
 
@@ -388,7 +396,7 @@ vm_consts:
        PROGINSTR
 
        ;increment address
-       addi r2, r2, 8
+       addi r2, r2, 2
 
        br+ vm_loop
 
@@ -412,7 +420,7 @@ vm_lessthan:
        PROGINSTR
 
        ;increment address
-       addi r2, r2, 20
+       addi r2, r2, 5
 
        br+ vm_loop
 
@@ -429,7 +437,7 @@ vm_dup:
        PROGINSTR
 
        ;increment address
-       addi r2, r2, 8
+       addi r2, r2, 2
 
        br+ vm_loop
 
@@ -489,7 +497,7 @@ vm_imm:
        PROGINSTR
 
        ;increment address
-       addi r2, r2, 12
+       addi r2, r2, 3
 
        ;pc+4
        addi r1, r1, 4
@@ -523,7 +531,7 @@ vm_jmp:
        PROGINSTR
 
        ;we add the offset to this instruction
-       addi r8, r2, 12
+       addi r8, r2, 3
 
 
        ;we know calculate the jump destination
@@ -554,7 +562,7 @@ vm_jmp:
        sub r8, r0, r8
        ;we shift 2 bits out, because rel. br takes instr.
        ;count and not address amount ...
-       lrs r8, r8, 2
+       ;lrs r8, r8, 2
        ;set the upper 16 bit 0
        andx r8, 0xFFFF
        ;shift to the position of imm in br
@@ -565,7 +573,7 @@ vm_jmp:
        PROGINSTR
 
        ;increment address
-       addi r2, r2, 16
+       addi r2, r2, 4
 
        br+ vm_loop
 
@@ -591,7 +599,7 @@ vm_possign:
        ;increment defer table address
        addi r9, r9, 8
        ;increment address
-       addi r2, r2, 16
+       addi r2, r2, 4
        br+ vm_loop
 
 ;case P
@@ -606,7 +614,7 @@ vm_pop:
        PROGINSTR
 
        ;increment address
-       addi r2, r2, 4
+       addi r2, r2, 1
 
        br+ vm_loop
 
@@ -628,7 +636,7 @@ vm_xch:
        PROGINSTR
 
        ;increment address
-       addi r2, r2, 16
+       addi r2, r2, 4
 
        br+ vm_loop
 
@@ -648,7 +656,7 @@ vm_not:
        PROGINSTR
 
        ;increment address
-       addi r2, r2, 12
+       addi r2, r2, 3
 
        br+ vm_loop