From: Slava Pestov <slava@shill.local>
Date: Sun, 20 Sep 2009 08:48:08 +0000 (-0500)
Subject: Merge Phil Dawes' VM work
X-Git-Tag: 0.97~5502^2~2
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=f8a91438cd5a18e209f8b2bc12ce8da817f3110f

Merge Phil Dawes' VM work
---

f8a91438cd5a18e209f8b2bc12ce8da817f3110f
diff --cc basis/cpu/ppc/ppc.factor
index 72ad543307,83f1bc9a74..2a16a8b6df
--- a/basis/cpu/ppc/ppc.factor
+++ b/basis/cpu/ppc/ppc.factor
@@@ -7,9 -7,8 +7,9 @@@ cpu.ppc.assembler cpu.ppc.assembler.bac
  compiler.cfg.instructions compiler.cfg.comparisons
  compiler.codegen.fixup compiler.cfg.intrinsics
  compiler.cfg.stack-frame compiler.cfg.build-stack-frame
- compiler.units compiler.constants compiler.codegen ;
+ compiler.units compiler.constants compiler.codegen vm ;
  FROM: cpu.ppc.assembler => B ;
 +FROM: math => float ;
  IN: cpu.ppc
  
  ! PowerPC register assignments:
diff --cc basis/cpu/x86/x86.factor
index 04b5308836,91705efec6..97bd2f78de
--- a/basis/cpu/x86/x86.factor
+++ b/basis/cpu/x86/x86.factor
@@@ -4,15 -4,14 +4,14 @@@ USING: accessors assocs alien alien.c-t
  cpu.x86.assembler cpu.x86.assembler.private cpu.x86.assembler.operands
  cpu.architecture kernel kernel.private math memory namespaces make
  sequences words system layouts combinators math.order fry locals
--compiler.constants byte-arrays
++compiler.constants vm byte-arrays
  compiler.cfg.registers
  compiler.cfg.instructions
  compiler.cfg.intrinsics
  compiler.cfg.comparisons
  compiler.cfg.stack-frame
--compiler.codegen
 -compiler.codegen.fixup vm ;
 +compiler.codegen.fixup ;
 +FROM: math => float ;
  IN: cpu.x86
  
  << enable-fixnum-log2 >>