From 29309fb4149ec02f993f84ffe4675e95c98db832 Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Tue, 2 Feb 2010 12:26:09 -0700 Subject: [PATCH] update Thread field offsets to reflect recent additions Every time we add or remove fields to Thread, we need to update the assembly code to reflect the new offsets. --- src/compile-powerpc.S | 10 +++++----- src/continuations-x86.S | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/compile-powerpc.S b/src/compile-powerpc.S index c90f16c625..8936899b53 100644 --- a/src/compile-powerpc.S +++ b/src/compile-powerpc.S @@ -24,11 +24,11 @@ # define GLOBAL(x) x #endif -#define THREAD_CONTINUATION 100 -#define THREAD_EXCEPTION 36 -#define THREAD_EXCEPTION_STACK_ADJUSTMENT 104 -#define THREAD_EXCEPTION_OFFSET 108 -#define THREAD_EXCEPTION_HANDLER 112 +#define THREAD_CONTINUATION 112 +#define THREAD_EXCEPTION 44 +#define THREAD_EXCEPTION_STACK_ADJUSTMENT 116 +#define THREAD_EXCEPTION_OFFSET 120 +#define THREAD_EXCEPTION_HANDLER 124 #define CONTINUATION_NEXT 4 #define CONTINUATION_ADDRESS 16 diff --git a/src/continuations-x86.S b/src/continuations-x86.S index 2151659ddf..aeee640388 100644 --- a/src/continuations-x86.S +++ b/src/continuations-x86.S @@ -10,11 +10,11 @@ #ifdef __x86_64__ -#define THREAD_CONTINUATION 176 -#define THREAD_EXCEPTION 64 -#define THREAD_EXCEPTION_STACK_ADJUSTMENT 184 -#define THREAD_EXCEPTION_OFFSET 192 -#define THREAD_EXCEPTION_HANDLER 200 +#define THREAD_CONTINUATION 192 +#define THREAD_EXCEPTION 80 +#define THREAD_EXCEPTION_STACK_ADJUSTMENT 200 +#define THREAD_EXCEPTION_OFFSET 208 +#define THREAD_EXCEPTION_HANDLER 216 #define CONTINUATION_NEXT 8 #define CONTINUATION_ADDRESS 32 @@ -89,11 +89,11 @@ LOCAL(vmInvoke_exit): #elif defined __i386__ -#define THREAD_CONTINUATION 100 -#define THREAD_EXCEPTION 36 -#define THREAD_EXCEPTION_STACK_ADJUSTMENT 104 -#define THREAD_EXCEPTION_OFFSET 108 -#define THREAD_EXCEPTION_HANDLER 112 +#define THREAD_CONTINUATION 108 +#define THREAD_EXCEPTION 44 +#define THREAD_EXCEPTION_STACK_ADJUSTMENT 112 +#define THREAD_EXCEPTION_OFFSET 116 +#define THREAD_EXCEPTION_HANDLER 120 #define CONTINUATION_NEXT 4 #define CONTINUATION_ADDRESS 16