From e825da60aa99057a330bd9c8633b265025a3392a Mon Sep 17 00:00:00 2001
From: Joel Dice <git@seibutsu.mailsnare.net>
Date: Fri, 30 Oct 2009 00:45:46 +0000
Subject: [PATCH] update continuation constants to reflect new field offsets

---
 makefile                |  2 ++
 src/compile-powerpc.S   |  8 ++++----
 src/continuations-x86.S | 16 ++++++++--------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/makefile b/makefile
index 000548b7aa..b6ce200fba 100644
--- a/makefile
+++ b/makefile
@@ -507,6 +507,8 @@ clean-native:
 	@echo "removing $(native-build)"
 	rm -rf $(native-build)
 
+$(native-build)/compile-x86-asm.o: $(src)/continuations-x86.S
+
 gen-arg = $(shell echo $(1) | sed -e 's:$(native-build)/type-\(.*\)\.cpp:\1:')
 $(generated-code): %.cpp: $(src)/types.def $(generator) $(classpath-dep)
 	@echo "generating $(@)"
diff --git a/src/compile-powerpc.S b/src/compile-powerpc.S
index 03e85b1ff9..c90f16c625 100644
--- a/src/compile-powerpc.S
+++ b/src/compile-powerpc.S
@@ -24,11 +24,11 @@
 #  define GLOBAL(x) x   
 #endif
       
-#define THREAD_CONTINUATION 96
+#define THREAD_CONTINUATION 100
 #define THREAD_EXCEPTION 36
-#define THREAD_EXCEPTION_STACK_ADJUSTMENT 100
-#define THREAD_EXCEPTION_OFFSET 104
-#define THREAD_EXCEPTION_HANDLER 108
+#define THREAD_EXCEPTION_STACK_ADJUSTMENT 104
+#define THREAD_EXCEPTION_OFFSET 108
+#define THREAD_EXCEPTION_HANDLER 112
 
 #define CONTINUATION_NEXT 4
 #define CONTINUATION_ADDRESS 16
diff --git a/src/continuations-x86.S b/src/continuations-x86.S
index bc19003758..59f11d2a28 100644
--- a/src/continuations-x86.S
+++ b/src/continuations-x86.S
@@ -1,10 +1,10 @@
 #ifdef __x86_64__
 
-#define THREAD_CONTINUATION 168
+#define THREAD_CONTINUATION 176
 #define THREAD_EXCEPTION 64
-#define THREAD_EXCEPTION_STACK_ADJUSTMENT 176
-#define THREAD_EXCEPTION_OFFSET 184
-#define THREAD_EXCEPTION_HANDLER 192
+#define THREAD_EXCEPTION_STACK_ADJUSTMENT 184
+#define THREAD_EXCEPTION_OFFSET 192
+#define THREAD_EXCEPTION_HANDLER 200
 
 #define CONTINUATION_NEXT 8
 #define CONTINUATION_ADDRESS 32
@@ -75,11 +75,11 @@ LOCAL(vmInvoke_exit):
 
 #elif defined __i386__
    
-#define THREAD_CONTINUATION 96
+#define THREAD_CONTINUATION 100
 #define THREAD_EXCEPTION 36
-#define THREAD_EXCEPTION_STACK_ADJUSTMENT 100
-#define THREAD_EXCEPTION_OFFSET 104
-#define THREAD_EXCEPTION_HANDLER 108
+#define THREAD_EXCEPTION_STACK_ADJUSTMENT 104
+#define THREAD_EXCEPTION_OFFSET 108
+#define THREAD_EXCEPTION_HANDLER 112
 
 #define CONTINUATION_NEXT 4
 #define CONTINUATION_ADDRESS 16