From 5b58117be1181c52424ee3617d9b5729919c1c44 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sat, 9 Jan 2010 19:09:48 +1300
Subject: [PATCH] cpu.x86: c-to-factor needs to deal with the fact that vm-reg
 might have been clobbered

---
 basis/cpu/x86/32/bootstrap.factor | 1 +
 basis/cpu/x86/64/bootstrap.factor | 1 +
 2 files changed, 2 insertions(+)

diff --git a/basis/cpu/x86/32/bootstrap.factor b/basis/cpu/x86/32/bootstrap.factor
index 8a5e43da31..2798677c2c 100644
--- a/basis/cpu/x86/32/bootstrap.factor
+++ b/basis/cpu/x86/32/bootstrap.factor
@@ -76,6 +76,7 @@ IN: bootstrap.x86
     ! call the quotation
     EAX quot-xt-offset [+] CALL
     ! save ds, rs registers
+    jit-load-vm
     jit-save-context
 ] \ c-to-factor define-sub-primitive
 
diff --git a/basis/cpu/x86/64/bootstrap.factor b/basis/cpu/x86/64/bootstrap.factor
index 2d0296e159..f47eb7eb70 100644
--- a/basis/cpu/x86/64/bootstrap.factor
+++ b/basis/cpu/x86/64/bootstrap.factor
@@ -74,6 +74,7 @@ IN: bootstrap.x86
     ctx-reg context-callstack-bottom-offset [+] safe-reg MOV
     ! call the quotation
     arg1 quot-xt-offset [+] CALL
+    jit-load-vm
     jit-save-context
 ] \ c-to-factor define-sub-primitive