diff --git a/basis/bootstrap/assembler/x86.factor b/basis/bootstrap/assembler/x86.factor index 2ffcfaed2d..f5dd5884e6 100644 --- a/basis/bootstrap/assembler/x86.factor +++ b/basis/bootstrap/assembler/x86.factor @@ -136,22 +136,6 @@ big-endian off leaf-stack-frame-size bootstrap-cell - RET ] \ leaf-signal-handler define-sub-primitive -[| | - jit-signal-handler-prolog - temp0 vm-reg vm-signal-handler-addr-offset [+] MOV - temp0 CALL - jit-signal-handler-epilog - red-zone-size RET -] \ ffi-signal-handler define-sub-primitive - -[| | - jit-signal-handler-prolog - temp0 vm-reg vm-signal-handler-addr-offset [+] MOV - temp0 CALL - jit-signal-handler-epilog - red-zone-size 16 bootstrap-cell - + RET -] \ ffi-leaf-signal-handler define-sub-primitive - [ ! load boolean temp0 ds-reg [] MOV diff --git a/basis/bootstrap/image/image.factor b/basis/bootstrap/image/image.factor index eeb3d3f9a1..7edc3c00ea 100755 --- a/basis/bootstrap/image/image.factor +++ b/basis/bootstrap/image/image.factor @@ -464,8 +464,6 @@ M: quotation prepare-object { SET-FPU-STATE-WORD set-fpu-state } { SIGNAL-HANDLER-WORD signal-handler } { LEAF-SIGNAL-HANDLER-WORD leaf-signal-handler } - { FFI-SIGNAL-HANDLER-WORD ffi-signal-handler } - { FFI-LEAF-SIGNAL-HANDLER-WORD ffi-leaf-signal-handler } } \ OBJ-UNDEFINED undefined-def 2array suffix [ swap execute( -- x ) special-objects get set-at diff --git a/basis/stack-checker/known-words/known-words.factor b/basis/stack-checker/known-words/known-words.factor index 1f10943d78..ad762cc3af 100644 --- a/basis/stack-checker/known-words/known-words.factor +++ b/basis/stack-checker/known-words/known-words.factor @@ -368,8 +368,6 @@ M: object infer-call* \ call bad-macro-input ; \ enable-gc-events { } { } define-primitive \ eq? { object object } { object } define-primitive \ eq? make-foldable \ fclose { alien } { } define-primitive -\ ffi-signal-handler { } { } define-primitive -\ ffi-leaf-signal-handler { } { } define-primitive \ fflush { alien } { } define-primitive \ fgetc { alien } { object } define-primitive \ fixnum* { fixnum fixnum } { integer } define-primitive \ fixnum* make-foldable diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor index 77572442be..ca5bb6f95d 100755 --- a/core/bootstrap/primitives.factor +++ b/core/bootstrap/primitives.factor @@ -345,8 +345,6 @@ tuple { "set-fpu-state" "kernel.private" ( -- ) } { "signal-handler" "kernel.private" ( -- ) } { "leaf-signal-handler" "kernel.private" ( -- ) } - { "ffi-signal-handler" "kernel.private" ( -- ) } - { "ffi-leaf-signal-handler" "kernel.private" ( -- ) } { "unwind-native-frames" "kernel.private" ( -- ) } { "set-callstack" "kernel.private" ( callstack -- * ) } { "lazy-jit-compile" "kernel.private" ( -- ) } diff --git a/core/kernel/kernel.factor b/core/kernel/kernel.factor index 7a1c21c110..faf1849373 100644 --- a/core/kernel/kernel.factor +++ b/core/kernel/kernel.factor @@ -41,8 +41,6 @@ PRIMITIVE: callstack-bounds ( -- start end ) PRIMITIVE: check-datastack ( array in# out# -- ? ) PRIMITIVE: compute-identity-hashcode ( obj -- ) PRIMITIVE: context-object ( n -- obj ) -PRIMITIVE: ffi-leaf-signal-handler ( -- ) -PRIMITIVE: ffi-signal-handler ( -- ) PRIMITIVE: fpu-state ( -- ) PRIMITIVE: innermost-frame-executing ( callstack -- obj ) PRIMITIVE: innermost-frame-scan ( callstack -- n ) @@ -369,8 +367,6 @@ CONSTANT: GET-FPU-STATE-WORD 46 CONSTANT: SET-FPU-STATE-WORD 47 CONSTANT: SIGNAL-HANDLER-WORD 48 CONSTANT: LEAF-SIGNAL-HANDLER-WORD 49 -CONSTANT: FFI-SIGNAL-HANDLER-WORD 50 -CONSTANT: FFI-LEAF-SIGNAL-HANDLER-WORD 51 CONSTANT: REDEFINITION-COUNTER 52 diff --git a/vm/objects.hpp b/vm/objects.hpp index 1039960881..02b9f3de4c 100644 --- a/vm/objects.hpp +++ b/vm/objects.hpp @@ -64,8 +64,8 @@ enum special_object { SET_FPU_STATE_WORD, SIGNAL_HANDLER_WORD, LEAF_SIGNAL_HANDLER_WORD, - FFI_SIGNAL_HANDLER_WORD, - FFI_LEAF_SIGNAL_HANDLER_WORD, + UNUSED1, + UNUSED2, /* Incremented on every modify-code-heap call; invalidates call( inline caching */