starting point - Fix bootstrap; I broke it in merging. Disable environment variables...

Disable intrinsics in cpu.x86.64 for now, since they invoke the compiler
Fix ##branch renaming to ##branch,
To work on this branch:
./factor -include=math -i=boot.image
./factor -run=listener
USE: compiler USE: tools.test save
enable-optimizer

Error message is now:
T{ vregs-shouldn't-interfere f 409 424 }

diff --git a/basis/compiler/cfg/linear-scan/resolve/resolve.factor b/basis/compiler/cfg/linear-scan/resolve/resolve.factor
index 3af803f90eae827f0a27c7e29400b710c84ace09..3fff763c6165539e1d836997989b14a93de32339 100644 (file)
--- a/basis/compiler/cfg/linear-scan/resolve/resolve.factor
+++ b/basis/compiler/cfg/linear-scan/resolve/resolve.factor
@@ -76,12 +76,6 @@ SYMBOL: temp-locations
 : register->memory ( from to -- )
     [ [ reg>> ] [ rep>> ] bi ] [ reg>> ] bi* ##spill, ;
 
-: temp->register ( from to -- )
-    nip [ reg>> ] [ rep>> ] [ rep>> spill-temp ] tri ##reload, ;
-
-: register->temp ( from to -- )
-    drop [ [ reg>> ] [ rep>> ] bi ] [ rep>> spill-temp ] bi ##spill, ;
-
 : register->register ( from to -- )
     swap [ reg>> ] [ [ reg>> ] [ rep>> ] bi ] bi* ##copy, ;
 
@@ -95,7 +89,7 @@ SYMBOL: temp-locations
 : mapping-instructions ( alist -- insns )
     [ swap ] H{ } assoc-map-as [
         [ temp-location ] [ swap >insn ] parallel-mapping
-        ##branch
+        ##branch,
     ] { } make ;
 
 : perform-mappings ( bb to mappings -- )

diff --git a/basis/compiler/cfg/parallel-copy/parallel-copy.factor b/basis/compiler/cfg/parallel-copy/parallel-copy.factor
index e006c620b037d7b88dc973a01dcd8793daf5fb4e..51cfc192e15271f193f62a1dcf69e1e7890fffe1 100644 (file)
--- a/basis/compiler/cfg/parallel-copy/parallel-copy.factor
+++ b/basis/compiler/cfg/parallel-copy/parallel-copy.factor
@@ -60,7 +60,7 @@ PRIVATE>
 
 : parallel-copy ( mapping -- )
     ! mapping is a list of { dst src } pairs
-    next-vreg '[ drop _ ] [ any-rep ##copy ] parallel-mapping ;
+    next-vreg '[ drop _ ] [ any-rep ##copy, ] parallel-mapping ;
 
 <PRIVATE
 
@@ -74,4 +74,4 @@ PRIVATE>
 : parallel-copy-rep ( mapping -- )
     ! mapping is a list of { dst src } pairs
     H{ } clone temp-vregs set
-    [ rep-of temp-vreg ] [ dup rep-of ##copy ] parallel-mapping ;
+    [ rep-of temp-vreg ] [ dup rep-of ##copy, ] parallel-mapping ;

diff --git a/basis/compiler/cfg/ssa/cssa/cssa.factor b/basis/compiler/cfg/ssa/cssa/cssa.factor
index 96ef723168679d500192710f8424f693a9c4cee2..7565be48b8f59d3fc66c5f95b6fcada6dd29847e 100644 (file)
--- a/basis/compiler/cfg/ssa/cssa/cssa.factor
+++ b/basis/compiler/cfg/ssa/cssa/cssa.factor
@@ -33,7 +33,7 @@ SYMBOL: copies
     ] each ;
 
 : insert-edge-copies ( from to copies -- )
-    [ ##parallel-copy ##branch ] { } make insert-basic-block ;
+    [ ##parallel-copy, ##branch, ] { } make insert-basic-block ;
 
 : insert-copies ( bb -- )
     [ copies get ] dip '[

diff --git a/basis/cpu/x86/64/64.factor b/basis/cpu/x86/64/64.factor
index dc83164b068267ecfb5663ed119ac001755a57e0..6f7e85ce1bec9a8b6cb63b8c855eff0e92052824 100644 (file)
--- a/basis/cpu/x86/64/64.factor
+++ b/basis/cpu/x86/64/64.factor
@@ -145,11 +145,11 @@ M: x86.64 (cpuid) ( rax rcx regs -- )
 
 ! The result of reading 4 bytes from memory is a fixnum on
 ! x86-64.
-enable-alien-4-intrinsics
+! enable-alien-4-intrinsics
 
 {
     { [ os unix? ] [ "cpu.x86.64.unix" require ] }
     { [ os windows? ] [ "cpu.x86.64.windows" require ] }
 } cond
 
-check-cpu-features
+! check-cpu-features

diff --git a/basis/environment/environment.factor b/basis/environment/environment.factor
index 92859349b74485450691e5792b995e50247d0090..abfa04e6a81b5ae278af0df8daebb1254194565e 100644 (file)
--- a/basis/environment/environment.factor
+++ b/basis/environment/environment.factor
@@ -31,9 +31,9 @@ HOOK: set-os-envs-pointer os ( malloc -- )
 } cond
 
 [
-    "FACTOR_ROOTS" os-env
-    [
-        os windows? ";" ":" ? split
-        [ add-vocab-root ] each
-    ] when*    
+    ! "FACTOR_ROOTS" os-env
+    ! [
+        ! os windows? ";" ":" ? split
+        ! [ add-vocab-root ] each
+    ! ] when*    
 ] "environment" add-startup-hook