From 9725169ca7fccae8e20b234c85222c1bfb2c217a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= <bjourne@gmail.com>
Date: Mon, 31 Aug 2015 02:08:01 +0200
Subject: [PATCH] compiler.cfg.intrinsics.misc: use the
 vm-special-object-offset word

---
 basis/compiler/cfg/intrinsics/misc/misc.factor | 9 +++------
 basis/compiler/constants/constants.factor      | 1 -
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/basis/compiler/cfg/intrinsics/misc/misc.factor b/basis/compiler/cfg/intrinsics/misc/misc.factor
index 37d0c5815a..293733e809 100644
--- a/basis/compiler/cfg/intrinsics/misc/misc.factor
+++ b/basis/compiler/cfg/intrinsics/misc/misc.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors classes.algebra compiler.cfg.builder.blocks
 compiler.cfg.comparisons compiler.cfg.hats
-compiler.cfg.instructions compiler.cfg.stacks
+compiler.cfg.instructions compiler.cfg.stacks compiler.constants
 compiler.tree.propagation.info cpu.architecture kernel layouts
 math namespaces sequences vm ;
 IN: compiler.cfg.intrinsics.misc
@@ -14,20 +14,17 @@ IN: compiler.cfg.intrinsics.misc
     node-input-infos first2 [ class>> fixnum class<= ] both?
     [ [ cc= ^^compare-integer ] binary-op ] [ [ cc= ^^compare ] binary-op ] if ;
 
-: special-object-offset ( n -- offset )
-    cells "special-objects" vm-field-offset + ;
-
 : emit-special-object ( node -- )
     dup node-input-infos first literal>> [
         ds-drop
-        special-object-offset ^^vm-field
+        vm-special-object-offset ^^vm-field
         ds-push
     ] [ emit-primitive ] ?if ;
 
 : emit-set-special-object ( node -- )
     dup node-input-infos second literal>> [
         ds-drop
-        [ ds-pop ] dip special-object-offset ##set-vm-field,
+        [ ds-pop ] dip vm-special-object-offset ##set-vm-field,
     ] [ emit-primitive ] ?if ;
 
 : context-object-offset ( n -- n )
diff --git a/basis/compiler/constants/constants.factor b/basis/compiler/constants/constants.factor
index cb5202a167..b0098982c5 100644
--- a/basis/compiler/constants/constants.factor
+++ b/basis/compiler/constants/constants.factor
@@ -35,7 +35,6 @@ CONSTANT: deck-bits 18
 : vm-signal-handler-addr-offset ( -- n ) 8 bootstrap-cells ; inline
 : vm-fault-flag-offset ( -- n ) 9 bootstrap-cells ; inline
 : vm-special-object-offset ( n -- offset )
-    ! Can't reuse the one in compiler.cfg.intrinsics.misc :(
     bootstrap-cells 10 bootstrap-cells + ;
 
 ! Relocation classes