Rename get-fpu-state entry point to fpu-state, and fix stack-checker unit tests

diff --git a/basis/bootstrap/image/image.factor b/basis/bootstrap/image/image.factor
index 891dbb9b4d7fd5b2a9bd44310a44456ba525f15c..623b169853c955d987d0d231bd7add6996db1df3 100755 (executable)
--- a/basis/bootstrap/image/image.factor
+++ b/basis/bootstrap/image/image.factor
@@ -201,7 +201,7 @@ SPECIAL-OBJECT: jit-declare-word 41
 SPECIAL-OBJECT: c-to-factor-word 42
 SPECIAL-OBJECT: lazy-jit-compile-word 43
 SPECIAL-OBJECT: unwind-native-frames-word 44
-SPECIAL-OBJECT: get-fpu-state-word 45
+SPECIAL-OBJECT: fpu-state-word 45
 SPECIAL-OBJECT: set-fpu-state-word 46
 
 SPECIAL-OBJECT: callback-stub 48
@@ -542,7 +542,7 @@ M: quotation '
     \ c-to-factor c-to-factor-word set
     \ lazy-jit-compile lazy-jit-compile-word set
     \ unwind-native-frames unwind-native-frames-word set
-    \ get-fpu-state get-fpu-state-word set
+    \ fpu-state fpu-state-word set
     \ set-fpu-state set-fpu-state-word set
     undefined-def undefined-quot set ;
 

diff --git a/basis/cpu/x86/32/bootstrap.factor b/basis/cpu/x86/32/bootstrap.factor
index f95bb6c900d53b0eb03a812b8c5f2885c160abe9..95481712caf54da4827f8f9143879ec71327a6e5 100755 (executable)
--- a/basis/cpu/x86/32/bootstrap.factor
+++ b/basis/cpu/x86/32/bootstrap.factor
@@ -128,7 +128,7 @@ IN: bootstrap.x86
     FNINIT
     AX ESP [] MOV
     ESP 2 ADD
-] \ get-fpu-state define-sub-primitive
+] \ fpu-state define-sub-primitive
 
 [
     ESP stack-frame-size [+] FLDCW

diff --git a/basis/cpu/x86/64/bootstrap.factor b/basis/cpu/x86/64/bootstrap.factor
index a20bcd02a9fc9620a62fc239a4cf177937e49d9f..f3de6b900e84b12d7fc03bc8f6dcafb7c0d5dedc 100755 (executable)
--- a/basis/cpu/x86/64/bootstrap.factor
+++ b/basis/cpu/x86/64/bootstrap.factor
@@ -120,7 +120,7 @@ IN: bootstrap.x86
     FNINIT
     AX RSP [] MOV
     RSP 2 ADD
-] \ get-fpu-state define-sub-primitive
+] \ fpu-state define-sub-primitive
 
 [
     RSP 2 SUB

diff --git a/basis/stack-checker/known-words/known-words.factor b/basis/stack-checker/known-words/known-words.factor
index d136f49f76bb453e0af5c9f5a9217f8c9b7065c8..47e882f2277501705ddc2dfea87da23128876aca 100644 (file)
--- a/basis/stack-checker/known-words/known-words.factor
+++ b/basis/stack-checker/known-words/known-words.factor
@@ -407,6 +407,7 @@ M: object infer-call* \ call bad-macro-input ;
 \ float>bignum { float } { bignum } define-primitive \ float>bignum make-foldable
 \ float>bits { real } { integer } define-primitive \ float>bits make-foldable
 \ float>fixnum { float } { fixnum } define-primitive \ bignum>fixnum make-foldable
+\ fpu-state { } { } define-primitive
 \ fputc { object alien } { } define-primitive
 \ fread { integer alien } { object } define-primitive
 \ fseek { integer integer alien } { } define-primitive
@@ -444,6 +445,7 @@ M: object infer-call* \ call bad-macro-input ;
 \ set-alien-unsigned-8 { integer c-ptr integer } { } define-primitive
 \ set-alien-unsigned-cell { integer c-ptr integer } { } define-primitive
 \ set-context-object { object fixnum } { } define-primitive
+\ set-fpu-state { } { } define-primitive
 \ set-innermost-frame-quot { quotation callstack } { } define-primitive
 \ set-slot { object object fixnum } { } define-primitive
 \ set-special-object { object fixnum } { } define-primitive

diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor
index bdd94462e8cc3131e1fdf242fa1e4ead8ddc4489..8e3af26932377db2c1a3cf7bfae6f083d0b75e8e 100755 (executable)
--- a/core/bootstrap/primitives.factor
+++ b/core/bootstrap/primitives.factor
@@ -340,7 +340,7 @@ tuple
     { "tag" "kernel.private" (( object -- n )) }
     { "(execute)" "kernel.private" (( word -- )) }
     { "(call)" "kernel.private" (( quot -- )) }
-    { "get-fpu-state" "kernel.private" (( -- )) }
+    { "fpu-state" "kernel.private" (( -- )) }
     { "set-fpu-state" "kernel.private" (( -- )) }
     { "unwind-native-frames" "kernel.private" (( -- )) }
     { "set-callstack" "kernel.private" (( callstack -- * )) }