VM: rename of JIT_PUSH_IMMEDIATE to JIT_PUSH_LITERAL

The code template pushes both immediates and references so the name was
wrong.

diff --git a/basis/bootstrap/assembler/ppc.factor b/basis/bootstrap/assembler/ppc.factor
index ded9e73346d89880106a9bc977e58ea608631f61..09bbe19d57015a030152d54e539c8f0afe0969a4 100644 (file)
--- a/basis/bootstrap/assembler/ppc.factor
+++ b/basis/bootstrap/assembler/ppc.factor
@@ -149,7 +149,7 @@ IN: bootstrap.ppc
 [
     3 jit-load-literal-arg
     3 ds-reg cell-size jit-save-cell-update
-] JIT-PUSH-IMMEDIATE jit-define
+] JIT-PUSH-LITERAL jit-define
 
 [
     jit-save-context

diff --git a/basis/bootstrap/assembler/x86.factor b/basis/bootstrap/assembler/x86.factor
index b24fbc626b1b437d28c5ae8ed784f31a589d2af0..c53f463ee981f25c1b315523e7f4f25b3493d19b 100644 (file)
--- a/basis/bootstrap/assembler/x86.factor
+++ b/basis/bootstrap/assembler/x86.factor
@@ -88,7 +88,7 @@ big-endian off
     ds-reg bootstrap-cell ADD
     ! store literal on datastack
     ds-reg [] temp0 MOV
-] JIT-PUSH-IMMEDIATE jit-define
+] JIT-PUSH-LITERAL jit-define
 
 [
     0 CALL f rc-relative rel-word-pic

diff --git a/core/kernel/kernel-docs.factor b/core/kernel/kernel-docs.factor
index 2ad5d16cce1462bea58adfaefda1c8b5a3a344fb..facf08e51382b50a40642c06bf8f991db4fbc104 100644 (file)
--- a/core/kernel/kernel-docs.factor
+++ b/core/kernel/kernel-docs.factor
@@ -2,12 +2,15 @@ USING: alien arrays classes combinators help.markup help.syntax
 kernel.private layouts math quotations system words ;
 IN: kernel
 
-HELP: WIN-EXCEPTION-HANDLER
-{ $description "This special object is an " { $link alien } " containing a pointer to the processes global exception handler. Only applicable on " { $link windows } "." } ;
+HELP: JIT-PUSH-LITERAL
+{ $description "JIT code template for pushing literals unto the datastack." } ;
 
 HELP: OBJ-UNDEFINED
 { $description "Default definition for undefined words" } ;
 
+HELP: WIN-EXCEPTION-HANDLER
+{ $description "This special object is an " { $link alien } " containing a pointer to the processes global exception handler. Only applicable on " { $link windows } "." } ;
+
 HELP: eq?
 { $values { "obj1" object } { "obj2" object } { "?" boolean } }
 { $description "Tests if two references point at the same object." } ;

diff --git a/core/kernel/kernel.factor b/core/kernel/kernel.factor
index 4b53ca0ac71183399a38def500cd906c9e4731fb..c685dcbed07cd191fc8ab184cebd41e79cde0a39 100644 (file)
--- a/core/kernel/kernel.factor
+++ b/core/kernel/kernel.factor
@@ -348,7 +348,7 @@ CONSTANT: JIT-SAFEPOINT 30
 CONSTANT: JIT-EPILOG 31
 CONSTANT: JIT-RETURN 32
 CONSTANT: JIT-UNUSED 33
-CONSTANT: JIT-PUSH-IMMEDIATE 34
+CONSTANT: JIT-PUSH-LITERAL 34
 CONSTANT: JIT-DIP-WORD 35
 CONSTANT: JIT-DIP 36
 CONSTANT: JIT-2DIP-WORD 37

diff --git a/vm/jit.hpp b/vm/jit.hpp
index 07ad2d1b848b602e488218c8a3d1ef3d4b1b205e..d4c0e7565341d09c7bf7fb3c71956a67ab6e5bac 100644 (file)
--- a/vm/jit.hpp
+++ b/vm/jit.hpp
@@ -32,7 +32,7 @@ struct jit {
 
   /* Allocates memory */
   void push(cell literal) {
-    emit_with_literal(parent->special_objects[JIT_PUSH_IMMEDIATE], literal);
+    emit_with_literal(parent->special_objects[JIT_PUSH_LITERAL], literal);
   }
 
   bool emit_subprimitive(cell word_, bool tail_call_p, bool stack_frame_p);

diff --git a/vm/objects.hpp b/vm/objects.hpp
index ee9ae61f2ca2a3dd2779aa24048e00593c4d0349..9a54279ffd1f60a6ccbdfb2ca2819286316384fa 100644 (file)
--- a/vm/objects.hpp
+++ b/vm/objects.hpp
@@ -44,7 +44,7 @@ enum special_object {
   JIT_EPILOG,
   JIT_RETURN,
   JIT_UNUSED,
-  JIT_PUSH_IMMEDIATE,
+  JIT_PUSH_LITERAL,
   JIT_DIP_WORD,
   JIT_DIP,
   JIT_2DIP_WORD,