Remove debugging code, fix typo in x86 backend

diff --git a/library/compiler/templates.factor b/library/compiler/templates.factor
index fa0093132cea7c1f517a0116f96b10366e0f731a..ea018a4c7a2af41129c0eeb63aebc63c2b536527 100644 (file)
--- a/library/compiler/templates.factor
+++ b/library/compiler/templates.factor
@@ -90,7 +90,7 @@ SYMBOL: phantom-r
 : lazy-load ( value loc -- value )
     over ds-loc? pick cs-loc? or [
         dupd = [
-            >r alloc-reg <vreg> dup r> %peek , ! drop f
+            drop f
         ] [
             >r alloc-reg <vreg> dup r> %peek ,
         ] if

diff --git a/library/compiler/x86/generator.factor b/library/compiler/x86/generator.factor
index 317aa8d5d81c8c1a03fd0e81143dd4f30304b505..1d272a03be96ca4c2a1db6cd31565f5bf2620d00 100644 (file)
--- a/library/compiler/x86/generator.factor
+++ b/library/compiler/x86/generator.factor
@@ -73,7 +73,7 @@ M: %type generate-node ( vop -- )
     0 scratch object-tag CMP
     "f" get JE
     ! The pointer is not equal to 3. Load the object header.
-    0 output-operand ECX object-tag neg [+] MOV
+    0 output-operand 0 scratch object-tag neg [+] MOV
     ! Mask off header tag, making a fixnum.
     0 output-operand object-tag XOR
     "end" get JMP

diff --git a/library/test/compiler/templates.factor b/library/test/compiler/templates.factor
index 54862ae6ebbaae8177a74bf509e6beb66c5fc186..dadaf1650d912e31b0a4da53ac3931264669ea55 100644 (file)
--- a/library/test/compiler/templates.factor
+++ b/library/test/compiler/templates.factor
@@ -18,6 +18,9 @@ math-internals namespaces test ;
 
 [ 2 3 4 ] [ 3 [ 2 swap 4 ] compile-1 ] unit-test
 
+[ { 1 2 3 } { 1 4 3 } 3 3 ]
+[ { 1 2 3 } { 1 4 3 } [ over tag over tag ] compile-1 ]
+
 [ { 1 2 3 } { 1 4 3 } 8 8 ]
 [ { 1 2 3 } { 1 4 3 } [ over type over type ] compile-1 ]
 unit-test