steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

JIT_UNUSED (removing it breaks boot images)
db4
Björn Lindqvist 2015-08-12 03:22:24 +02:00 committed by John Benediktsson
parent dbb045e2cd
commit 9413f711b9
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
basis/bootstrap/assembler/ppc.factor
View File

@ -136,19 +136,6 @@ IN: bootstrap.ppc
ds-reg ctx-reg context-datastack-offset jit-load-cell ds-reg ctx-reg context-datastack-offset jit-load-cell
rs-reg ctx-reg context-retainstack-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 MFLR
0 1 lr-save jit-save-cell 0 1 lr-save jit-save-cell

3
core/kernel/kernel.factor
View File

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

7
vm/objects.hpp
View File

@ -44,7 +44,7 @@ enum special_object {
JIT_SAFEPOINT, JIT_SAFEPOINT,
JIT_EPILOG, JIT_EPILOG,
JIT_RETURN, JIT_RETURN,
JIT_PROFILING, JIT_UNUSED,
JIT_PUSH_IMMEDIATE, JIT_PUSH_IMMEDIATE,
JIT_DIP_WORD, JIT_DIP_WORD,
JIT_DIP, JIT_DIP,
@ -55,7 +55,8 @@ enum special_object {
JIT_EXECUTE, JIT_EXECUTE,
JIT_DECLARE_WORD, JIT_DECLARE_WORD,
/* External entry points */ /* External entry points. These are defined in the files in
bootstrap/assembler/ */
C_TO_FACTOR_WORD = 43, C_TO_FACTOR_WORD = 43,
LAZY_JIT_COMPILE_WORD, LAZY_JIT_COMPILE_WORD,
UNWIND_NATIVE_FRAMES_WORD, UNWIND_NATIVE_FRAMES_WORD,
@ -70,7 +71,7 @@ enum special_object {
caching */ caching */
REDEFINITION_COUNTER = 52, REDEFINITION_COUNTER = 52,
/* Callback stub generation in callbacks.c */ /* Callback stub generation in callbacks.cpp */
CALLBACK_STUB = 53, CALLBACK_STUB = 53,
/* Polymorphic inline cache generation in inline_cache.c */ /* Polymorphic inline cache generation in inline_cache.c */