VM: the JIT_PROFILING special object is never used, so rename it to

JIT_UNUSED (removing it breaks boot images)

diff --git a/basis/bootstrap/assembler/ppc.factor b/basis/bootstrap/assembler/ppc.factor
index 5d4b96372b03ce737088f3dd3293332ba6477d5e..f7d002cef824374374d65e61b412d9d26f41ac3a 100644 (file)
--- a/basis/bootstrap/assembler/ppc.factor
+++ b/basis/bootstrap/assembler/ppc.factor
@@ -136,19 +136,6 @@ IN: bootstrap.ppc
     ds-reg ctx-reg context-datastack-offset jit-load-cell
     rs-reg ctx-reg context-retainstack-offset jit-load-cell ;
 
-[
-    12 jit-load-literal-arg
-    0 profile-count-offset LI
-    11 12 0 jit-load-cell-x
-    11 11 1 tag-fixnum ADDI
-    11 12 0 jit-save-cell-x
-    0 word-code-offset LI
-    11 12 0 jit-load-cell-x
-    11 11 compiled-header-size ADDI
-    11 MTCTR
-    BCTR
-] JIT-PROFILING jit-define
-
 [
     0 MFLR
     0 1 lr-save jit-save-cell

diff --git a/core/kernel/kernel.factor b/core/kernel/kernel.factor
index aef320657536c2ab791b127af016556b7c3ef957..5a53d39848e9e9b6795e9dca8ce1b54e0cd4abf2 100644 (file)
--- a/core/kernel/kernel.factor
+++ b/core/kernel/kernel.factor
@@ -315,7 +315,6 @@ ERROR: assert got expect ;
 ! Special object count and identifiers must be kept in sync with:
 !   vm/objects.hpp
 !   basis/bootstrap/image/image.factor
-
 CONSTANT: special-object-count 80
 
 CONSTANT: OBJ-WALKER-HOOK 3
@@ -355,7 +354,7 @@ CONSTANT: JIT-IF 29
 CONSTANT: JIT-SAFEPOINT 30
 CONSTANT: JIT-EPILOG 31
 CONSTANT: JIT-RETURN 32
-CONSTANT: JIT-PROFILING 33
+CONSTANT: JIT-UNUSED 33
 CONSTANT: JIT-PUSH-IMMEDIATE 34
 CONSTANT: JIT-DIP-WORD 35
 CONSTANT: JIT-DIP 36

diff --git a/vm/objects.hpp b/vm/objects.hpp
index e97877a45ed363b3198b1ed29be04a6ac73d65de..10399608812ac3c02ed316571396a1016fd37053 100644 (file)
--- a/vm/objects.hpp
+++ b/vm/objects.hpp
@@ -44,7 +44,7 @@ enum special_object {
   JIT_SAFEPOINT,
   JIT_EPILOG,
   JIT_RETURN,
-  JIT_PROFILING,
+  JIT_UNUSED,
   JIT_PUSH_IMMEDIATE,
   JIT_DIP_WORD,
   JIT_DIP,
@@ -55,7 +55,8 @@ enum special_object {
   JIT_EXECUTE,
   JIT_DECLARE_WORD,
 
-  /* External entry points */
+  /* External entry points. These are defined in the files in
+     bootstrap/assembler/ */
   C_TO_FACTOR_WORD = 43,
   LAZY_JIT_COMPILE_WORD,
   UNWIND_NATIVE_FRAMES_WORD,
@@ -70,7 +71,7 @@ enum special_object {
      caching */
   REDEFINITION_COUNTER = 52,
 
-  /* Callback stub generation in callbacks.c */
+  /* Callback stub generation in callbacks.cpp */
   CALLBACK_STUB = 53,
 
   /* Polymorphic inline cache generation in inline_cache.c */