From 64e3e0c0d69ee8fe4ac211fa491d2994a4959643 Mon Sep 17 00:00:00 2001
From: Slava <slava@emu.(none)>
Date: Sat, 22 Sep 2007 18:56:27 -0400
Subject: [PATCH] Fix callstack relocation

---
 extra/factory/.factory-menus.swp | Bin 20480 -> 0 bytes
 vm/image.c                       |  19 ++++++++++++++-----
 vm/stack.c                       |   4 ++--
 vm/stack.h                       |   2 ++
 4 files changed, 18 insertions(+), 7 deletions(-)
 delete mode 100644 extra/factory/.factory-menus.swp

diff --git a/extra/factory/.factory-menus.swp b/extra/factory/.factory-menus.swp
deleted file mode 100644
index 241afbf9d743d8df82d29f4298157ebb10de6d4e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20480
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
EKlcQPL;wH)

diff --git a/vm/image.c b/vm/image.c
index 2d3318472d..32e628f902 100644
--- a/vm/image.c
+++ b/vm/image.c
@@ -173,6 +173,8 @@ void fixup_alien(F_ALIEN *d)
 	d->expired = T;
 }
 
+F_FIXNUM delta;
+
 void fixup_stack_frame(F_STACK_FRAME *frame)
 {
 	code_fixup(&frame->xt);
@@ -185,13 +187,22 @@ void fixup_stack_frame(F_STACK_FRAME *frame)
 	}
 
 #ifdef CALLSTACK_UP_P
-	printf("%x %x\n",frame->xt,*(CELL *)(frame->next + 1));
-	code_fixup((CELL *)(frame->next + 1));
+	F_STACK_FRAME *next = REBASE_FRAME_SUCCESSOR(frame,delta);
+	code_fixup((XT *)(next + 1));
 #else
 	code_fixup(&frame->return_address);
 #endif
 }
 
+void fixup_callstack_object(F_CALLSTACK *stack)
+{
+	CELL top = (CELL)(stack + 1);
+	CELL bottom = top + untag_fixnum_fast(stack->length);
+	delta = (bottom - stack->bottom);
+
+	iterate_callstack_object(stack,fixup_stack_frame);
+}
+
 /* Initialize an object in a newly-loaded image */
 void relocate_object(CELL relocating)
 {
@@ -212,9 +223,7 @@ void relocate_object(CELL relocating)
 		fixup_alien((F_ALIEN *)relocating);
 		break;
 	case CALLSTACK_TYPE:
-		iterate_callstack_object(
-			(F_CALLSTACK *)relocating,
-			fixup_stack_frame);
+		fixup_callstack_object((F_CALLSTACK *)relocating);
 		break;
 	}
 }
diff --git a/vm/stack.c b/vm/stack.c
index e50575219c..cf3c1df00a 100644
--- a/vm/stack.c
+++ b/vm/stack.c
@@ -111,7 +111,7 @@ void iterate_callstack(CELL top, CELL bottom, CELL base, CALLSTACK_ITER iterator
 
 	while(ITERATING_P)
 	{
-		F_STACK_FRAME *next = (F_STACK_FRAME *)((CELL)FRAME_SUCCESSOR(frame) + delta);
+		F_STACK_FRAME *next = REBASE_FRAME_SUCCESSOR(frame,delta);
 		iterator(frame);
 		frame = next;
 	}
@@ -344,7 +344,7 @@ static F_FIXNUM delta;
 
 void adjust_stack_frame(F_STACK_FRAME *frame)
 {
-	FRAME_SUCCESSOR(frame) = (F_STACK_FRAME *)((CELL)FRAME_SUCCESSOR(frame) + delta);
+	FRAME_SUCCESSOR(frame) = REBASE_FRAME_SUCCESSOR(frame,delta);
 }
 
 void adjust_callstack(F_CALLSTACK *stack, CELL bottom)
diff --git a/vm/stack.h b/vm/stack.h
index d2bec4fef1..62ee1d9ba2 100644
--- a/vm/stack.h
+++ b/vm/stack.h
@@ -56,6 +56,8 @@ void init_stacks(CELL ds_size, CELL rs_size);
 
 #define FIRST_STACK_FRAME(stack) (F_STACK_FRAME *)((stack) + 1)
 
+#define REBASE_FRAME_SUCCESSOR(frame,delta) (F_STACK_FRAME *)((CELL)FRAME_SUCCESSOR(frame) + delta)
+
 typedef void (*CALLSTACK_ITER)(F_STACK_FRAME *frame);
 
 void iterate_callstack(CELL top, CELL bottom, CELL base, CALLSTACK_ITER iterator);