From 85a45d63d97affa399c4afcd1dea75b37e221282 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 12 Jan 2010 16:31:10 +1300
Subject: [PATCH] unwind-stack-frames didn't load VM pointer into the VM
 register on PowerPC and x86-64, and so if C code had clobbered this register
 it would crash

---
 basis/cpu/ppc/bootstrap.factor    | 4 ++++
 basis/cpu/x86/64/bootstrap.factor | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/basis/cpu/ppc/bootstrap.factor b/basis/cpu/ppc/bootstrap.factor
index a40df575ea..69b6939cda 100644
--- a/basis/cpu/ppc/bootstrap.factor
+++ b/basis/cpu/ppc/bootstrap.factor
@@ -358,6 +358,10 @@ CONSTANT: ctx-reg 16
     ! Unwind stack frames
     1 4 MR
 
+    ! Load VM pointer into vm-reg, since we're entering from
+    ! C code
+    0 vm-reg LOAD32 0 rc-absolute-ppc-2/2 jit-vm
+
     ! Load ds and rs registers
     jit-restore-context
 
diff --git a/basis/cpu/x86/64/bootstrap.factor b/basis/cpu/x86/64/bootstrap.factor
index 3c324ce95d..74943a94bb 100644
--- a/basis/cpu/x86/64/bootstrap.factor
+++ b/basis/cpu/x86/64/bootstrap.factor
@@ -89,6 +89,10 @@ IN: bootstrap.x86
     ! Unwind stack frames
     RSP arg2 MOV
 
+    ! Load VM pointer into vm-reg, since we're entering from
+    ! C code
+    vm-reg 0 MOV 0 rc-absolute-cell jit-vm
+
     ! Load ds and rs registers
     jit-restore-context