update continuation constants to reflect new field offsets

This commit is contained in:
Joel Dice 2009-10-30 00:45:46 +00:00
parent d7d7443688
commit e825da60aa
3 changed files with 14 additions and 12 deletions

View File

@ -507,6 +507,8 @@ clean-native:
@echo "removing $(native-build)" @echo "removing $(native-build)"
rm -rf $(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:') gen-arg = $(shell echo $(1) | sed -e 's:$(native-build)/type-\(.*\)\.cpp:\1:')
$(generated-code): %.cpp: $(src)/types.def $(generator) $(classpath-dep) $(generated-code): %.cpp: $(src)/types.def $(generator) $(classpath-dep)
@echo "generating $(@)" @echo "generating $(@)"

View File

@ -24,11 +24,11 @@
# define GLOBAL(x) x # define GLOBAL(x) x
#endif #endif
#define THREAD_CONTINUATION 96 #define THREAD_CONTINUATION 100
#define THREAD_EXCEPTION 36 #define THREAD_EXCEPTION 36
#define THREAD_EXCEPTION_STACK_ADJUSTMENT 100 #define THREAD_EXCEPTION_STACK_ADJUSTMENT 104
#define THREAD_EXCEPTION_OFFSET 104 #define THREAD_EXCEPTION_OFFSET 108
#define THREAD_EXCEPTION_HANDLER 108 #define THREAD_EXCEPTION_HANDLER 112
#define CONTINUATION_NEXT 4 #define CONTINUATION_NEXT 4
#define CONTINUATION_ADDRESS 16 #define CONTINUATION_ADDRESS 16

View File

@ -1,10 +1,10 @@
#ifdef __x86_64__ #ifdef __x86_64__
#define THREAD_CONTINUATION 168 #define THREAD_CONTINUATION 176
#define THREAD_EXCEPTION 64 #define THREAD_EXCEPTION 64
#define THREAD_EXCEPTION_STACK_ADJUSTMENT 176 #define THREAD_EXCEPTION_STACK_ADJUSTMENT 184
#define THREAD_EXCEPTION_OFFSET 184 #define THREAD_EXCEPTION_OFFSET 192
#define THREAD_EXCEPTION_HANDLER 192 #define THREAD_EXCEPTION_HANDLER 200
#define CONTINUATION_NEXT 8 #define CONTINUATION_NEXT 8
#define CONTINUATION_ADDRESS 32 #define CONTINUATION_ADDRESS 32
@ -75,11 +75,11 @@ LOCAL(vmInvoke_exit):
#elif defined __i386__ #elif defined __i386__
#define THREAD_CONTINUATION 96 #define THREAD_CONTINUATION 100
#define THREAD_EXCEPTION 36 #define THREAD_EXCEPTION 36
#define THREAD_EXCEPTION_STACK_ADJUSTMENT 100 #define THREAD_EXCEPTION_STACK_ADJUSTMENT 104
#define THREAD_EXCEPTION_OFFSET 104 #define THREAD_EXCEPTION_OFFSET 108
#define THREAD_EXCEPTION_HANDLER 108 #define THREAD_EXCEPTION_HANDLER 112
#define CONTINUATION_NEXT 4 #define CONTINUATION_NEXT 4
#define CONTINUATION_ADDRESS 16 #define CONTINUATION_ADDRESS 16