Merge branch 'master' of git://factorcode.org/git/factor

diff --git a/basis/cpu/x86/32/bootstrap.factor b/basis/cpu/x86/32/bootstrap.factor
index 698c3a17668f0e815555593530e6790cbb0fc2a1..f29dec128ca8e82463dbfe2d04d5fbf0a68a47b3 100644 (file)
--- a/basis/cpu/x86/32/bootstrap.factor
+++ b/basis/cpu/x86/32/bootstrap.factor
@@ -10,6 +10,7 @@ IN: bootstrap.x86
 : shift-arg ( -- reg ) ECX ;
 : div-arg ( -- reg ) EAX ;
 : mod-arg ( -- reg ) EDX ;
+: arg ( -- reg ) EAX ;
 : temp0 ( -- reg ) EAX ;
 : temp1 ( -- reg ) EDX ;
 : temp2 ( -- reg ) ECX ;

diff --git a/basis/cpu/x86/64/unix/bootstrap.factor b/basis/cpu/x86/64/unix/bootstrap.factor
index a21c4534d25e153ee03382a784ac824f5b3d7fb3..20a953b6d509969fd0cf424fc3dc1832d501aac7 100644 (file)
--- a/basis/cpu/x86/64/unix/bootstrap.factor
+++ b/basis/cpu/x86/64/unix/bootstrap.factor
@@ -5,6 +5,7 @@ cpu.x86.assembler layouts vocabs parser ;
 IN: bootstrap.x86
 
 : stack-frame-size ( -- n ) 4 bootstrap-cells ;
+: arg ( -- reg ) RDI ;
 
 << "resource:basis/cpu/x86/64/bootstrap.factor" parse-file parsed >>
 call

diff --git a/basis/cpu/x86/64/winnt/bootstrap.factor b/basis/cpu/x86/64/winnt/bootstrap.factor
index 709f138463c6bbb1aa5cf008853520171e78ba00..3accca400f84f97108e5648be2ea30d6b41fa8f2 100644 (file)
--- a/basis/cpu/x86/64/winnt/bootstrap.factor
+++ b/basis/cpu/x86/64/winnt/bootstrap.factor
@@ -5,6 +5,7 @@ cpu.x86.assembler layouts vocabs parser ;
 IN: bootstrap.x86
 
 : stack-frame-size ( -- n ) 8 bootstrap-cells ;
+: arg ( -- reg ) RCX ;
 
 << "resource:basis/cpu/x86/64/bootstrap.factor" parse-file parsed >>
 call

diff --git a/basis/cpu/x86/bootstrap.factor b/basis/cpu/x86/bootstrap.factor
index 3451da78e1dda774e1f52ad894382d17d4396158..42fcfaa6a2421f0d851c884a701ea24485059b80 100644 (file)
--- a/basis/cpu/x86/bootstrap.factor
+++ b/basis/cpu/x86/bootstrap.factor
@@ -162,11 +162,11 @@ big-endian off
 ! Quotations and words
 [
     ! load from stack
-    temp0 ds-reg [] MOV
+    arg ds-reg [] MOV
     ! pop stack
     ds-reg bootstrap-cell SUB
     ! call quotation
-    temp0 quot-xt-offset [+] JMP
+    arg quot-xt-offset [+] JMP
 ] f f f \ (call) define-sub-primitive
 
 [

diff --git a/extra/benchmark/benchmark.factor b/extra/benchmark/benchmark.factor
index a1e892229ad8a0f84e0b4a82fcb58bf4cf3c2738..9afd2118766d9bebf382683e8797e4d07feb945a 100755 (executable)
--- a/extra/benchmark/benchmark.factor
+++ b/extra/benchmark/benchmark.factor
@@ -6,8 +6,10 @@ continuations debugger math ;
 IN: benchmark
 
 : run-benchmark ( vocab -- result )
-    [ [ require ] [ [ run ] benchmark ] bi ] curry
-    [ error. f ] recover ;
+    [ "=== " write vocab-name print flush ] [
+        [ [ require ] [ [ run ] benchmark ] bi ] curry
+        [ error. f ] recover
+    ] bi ;
 
 : run-benchmarks ( -- assoc )
     "benchmark" all-child-vocabs-seq