From b88d219ff632485aa4e37de2f8172c6ff0bf8b10 Mon Sep 17 00:00:00 2001
From: Slava <slava@emu.(none)>
Date: Thu, 17 Jan 2008 04:03:09 -0500
Subject: [PATCH 1/3] Fix x86

---
 core/cpu/x86/architecture/architecture.factor | 8 ++++----
 core/kernel/kernel-tests.factor               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/cpu/x86/architecture/architecture.factor b/core/cpu/x86/architecture/architecture.factor
index 96b2dcf1ec..cf2f5ee594 100755
--- a/core/cpu/x86/architecture/architecture.factor
+++ b/core/cpu/x86/architecture/architecture.factor
@@ -85,7 +85,7 @@ M: x86-backend %jump-label ( label -- ) JMP ;
 M: x86-backend %jump-t ( label -- )
     "flag" operand f v>operand CMP JNE ;
 
-: (%dispatch) ( -- operand )
+: (%dispatch) ( n -- operand )
     ! Load jump table base. We use a temporary register
     ! since on AMD64 we have to load a 64-bit immediate. On
     ! x86, this is redundant.
@@ -94,16 +94,16 @@ M: x86-backend %jump-t ( label -- )
     ! Add jump table base
     "offset" operand HEX: ffffffff MOV rc-absolute-cell rel-here
     "n" operand "offset" operand ADD
-    "n" operand bootstrap-cell 8 = 14 9 ? [+] ;
+    "n" operand swap bootstrap-cell 8 = 14 9 ? + [+] ;
 
 M: x86-backend %call-dispatch ( word-table# -- )
-    [ (%dispatch) CALL <label> dup JMP ] H{
+    [ 5 (%dispatch) CALL <label> dup JMP ] H{
         { +input+ { { f "n" } } }
         { +scratch+ { { f "offset" } } }
     } with-template ;
 
 M: x86-backend %jump-dispatch ( -- )
-    [ %epilogue-later (%dispatch) JMP ] H{
+    [ %epilogue-later 0 (%dispatch) JMP ] H{
         { +input+ { { f "n" } } }
         { +scratch+ { { f "offset" } } }
     } with-template ;
diff --git a/core/kernel/kernel-tests.factor b/core/kernel/kernel-tests.factor
index 2cb308b619..c294c23738 100755
--- a/core/kernel/kernel-tests.factor
+++ b/core/kernel/kernel-tests.factor
@@ -1,6 +1,6 @@
 USING: arrays byte-arrays kernel kernel.private math memory
 namespaces sequences tools.test math.private quotations
-continuations prettyprint io.streams.string debugger ;
+continuations prettyprint io.streams.string debugger assocs ;
 IN: temporary
 
 [ 0 ] [ f size ] unit-test

From b0944cb3f85915e2b5dc049f2e848cea9f9128f0 Mon Sep 17 00:00:00 2001
From: Slava <slava@emu.(none)>
Date: Thu, 17 Jan 2008 17:19:10 -0500
Subject: [PATCH 2/3] Another cpu.x86 fix

---
 core/cpu/x86/architecture/architecture.factor | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/cpu/x86/architecture/architecture.factor b/core/cpu/x86/architecture/architecture.factor
index cf2f5ee594..876c631b81 100755
--- a/core/cpu/x86/architecture/architecture.factor
+++ b/core/cpu/x86/architecture/architecture.factor
@@ -100,12 +100,14 @@ M: x86-backend %call-dispatch ( word-table# -- )
     [ 5 (%dispatch) CALL <label> dup JMP ] H{
         { +input+ { { f "n" } } }
         { +scratch+ { { f "offset" } } }
+        { +clobber+ { "n" } }
     } with-template ;
 
 M: x86-backend %jump-dispatch ( -- )
     [ %epilogue-later 0 (%dispatch) JMP ] H{
         { +input+ { { f "n" } } }
         { +scratch+ { { f "offset" } } }
+        { +clobber+ { "n" } }
     } with-template ;
 
 M: x86-backend %dispatch-label ( word -- )

From 6755e0f7ca7614f932bc17a06e096a9373e42522 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Thu, 17 Jan 2008 16:36:25 -0500
Subject: [PATCH 3/3] Fix unit test

---
 core/compiler/test/redefine.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/compiler/test/redefine.factor b/core/compiler/test/redefine.factor
index 821daef203..4f0c18dfd2 100755
--- a/core/compiler/test/redefine.factor
+++ b/core/compiler/test/redefine.factor
@@ -17,7 +17,7 @@ DEFER: x-2
 
         { x-1 } compile
 
-        \ x-2 word-xt eq?
+        \ x-2 word-xt =
     ] unit-test
 ] with-variable