compiler.cfg.intrinsics: fix doc and make tests work on 32bit

slavapestov · Dec 1, 2015 · a35895f · a35895f
1 parent 43f2592
commit a35895f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/basis/compiler/cfg/intrinsics/slots/slots-docs.factor b/basis/compiler/cfg/intrinsics/slots/slots-docs.factor
@@ -1,6 +1,6 @@
-USING: classes classes.builtin compiler.tree
-compiler.tree.propagation.info help.markup help.syntax layouts math
-slots.private ;
+USING: classes classes.builtin compiler.cfg.instructions compiler.tree
+compiler.tree.propagation.info help.markup help.syntax kernel layouts
+math slots.private ;
 IN: compiler.cfg.intrinsics.slots
 
 HELP: class-tag
@@ -15,13 +15,13 @@ HELP: class-tag
 } ;
 
 HELP: immediate-slot-offset?
-{ $values { "value-info" value-info-state } { "?" "true or false" } }
+{ $values { "object" object } { "?" "true or false" } }
 { $description
-  { $link t } " if the value info is a literal " { $link fixnum } " that is small enough to fit into a machine register." }
+  { $link t } " if the object is a " { $link fixnum } " that is small enough to fit into a machine register. It is used to determine whether immediate versions of the instructions " { $link ##set-slot } " and " { $link ##set-slot-imm } " can be emitted." }
 { $examples
   { $example
     "USING: compiler.cfg.intrinsics.slots compiler.tree.propagation.info prettyprint ;"
-    "33 <literal-info> immediate-slot-offset? ."
+    "33 immediate-slot-offset? ."
     "t"
   }
 } ;

diff --git a/basis/compiler/cfg/intrinsics/slots/slots-tests.factor b/basis/compiler/cfg/intrinsics/slots/slots-tests.factor
@@ -1,7 +1,7 @@
 USING: accessors arrays compiler.cfg compiler.cfg.instructions
 compiler.cfg.intrinsics.slots compiler.test compiler.tree
-compiler.tree.propagation.info kernel make math math.intervals
-namespaces sequences slots.private tools.test ;
+compiler.tree.propagation.info kernel layouts literals make math
+math.intervals namespaces sequences slots.private tools.test ;
 IN: compiler.cfg.intrinsics.slots.tests
 
 : call-node-1 ( -- node )
@@ -121,13 +121,13 @@ IN: compiler.cfg.intrinsics.slots.tests
            { src 1 }
            { obj 2 }
            { slot 3 }
-           { scale 3 }
+           { scale $[ cell log2 ] }
            { tag 2 }
         }
         T{ ##write-barrier
            { src 2 }
            { slot 3 }
-           { scale 3 }
+           { scale $[ cell log2 ] }
            { tag 2 }
            { temp1 4 }
            { temp2 5 }