From: Martin Perner <martin@perner.cc>
Date: Sun, 16 Jan 2011 11:07:55 +0000 (+0100)
Subject: deepjit/deepjit_reg: bugfixes
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=calu.git;a=commitdiff_plain;h=1008cb9007e11df5bbc5e447d11f9990ca14aa9b

deepjit/deepjit_reg: bugfixes
---

diff --git a/progs/Makefile b/progs/Makefile
index aee6275..06ccb39 100644
--- a/progs/Makefile
+++ b/progs/Makefile
@@ -10,7 +10,7 @@ else
 ifeq ($(findstring $(HN), $(STEFANHOST)), $(HN))
 DPROGFLAGS := -d /dev/ttyS0 -b 115200
 else
-DPROGFLAGS := -d /dev/ttyUSB0 -b 115200
+DPROGFLAGS := -d /dev/ttyS0 -b 115200
 endif
 endif
 
diff --git a/progs/deepjit.s b/progs/deepjit.s
index 4fe864b..0ee92ce 100644
--- a/progs/deepjit.s
+++ b/progs/deepjit.s
@@ -85,8 +85,8 @@ prog_jmp:
 .fill 1, 0xeb000003;br+ CONST
 
 prog_imm:
-.fill 1, 0xed400000;ldil r6, CONST
-.fill 1, 0xed400002;ldih r6, CONST
+.fill 1, 0xed300000;ldil r6, CONST
+.fill 1, 0xed300002;ldih r6, CONST
 .ifill push r6
 
 prog_pop:
diff --git a/progs/deepjit_reg.s b/progs/deepjit_reg.s
index 0b5ef31..cbef6ea 100644
--- a/progs/deepjit_reg.s
+++ b/progs/deepjit_reg.s
@@ -31,6 +31,7 @@ instrtable:
 .fill 42, 0
 
 prog_eof:
+.ifill pop r7
 .ifill mov r0, r6
 .ifill ret+
 
@@ -65,7 +66,7 @@ prog_sub:
 prog_lessthan:
 .ifill pop r7
 .ifill cmp r7, r6;0xec3b0000
-.ifill movlt r6, r14
+.ifill movdlt r6, r14
 .ifill movge r6, r15
 
 prog_dup:
@@ -80,8 +81,8 @@ prog_jmp:
 
 prog_imm:
 .ifill push r6
-.fill 1, 0xed400000;ldil r6, CONST
-.fill 1, 0xed400002;ldih r6, CONST
+.fill 1, 0xed300000;ldil r6, CONST
+.fill 1, 0xed300002;ldih r6, CONST
 
 prog_pop:
 .ifill pop r6
@@ -225,6 +226,8 @@ vm_eof:
 	stw r0, PDATA(r13)
 	ldw r0, 4(r4)
 	stw r0, PDATA(r13)
+	ldw r0, 8(r4)
+	stw r0, PDATA(r13)
 
 	;end of program
 	;now it is time to clear up the defer table
@@ -431,7 +434,7 @@ vm_imm:
 	ldil r4, prog_imm@lo
 	ldih r4, prog_imm@hi
 
-	ldw r0, 4(r4)
+	ldw r0, 0(r4)
 	PROGINSTR
 
 	;save r6 to r7