From 33d335af24c942ce5a9062a7cc7b9b74e3b4209f Mon Sep 17 00:00:00 2001 From: Christian Thalinger Date: Sat, 13 Oct 2007 18:57:38 +0200 Subject: [PATCH] * src/vm/jit/methodheader.h (IsSync): Removed. * src/vm/jit/dseg.c (dseg_addlinenumbertablesize): Removed one of the paddings. * src/vm/jit/arm/md.c (md_codegen_get_pv_from_pc): Commented the IsLeaf-check (this should be removed). * src/vm/jit/alpha/asmpart.S, src/vm/jit/arm/asmpart.S, src/vm/jit/i386/asmpart.S, src/vm/jit/m68k/asmpart.S, src/vm/jit/mips/asmpart.S, src/vm/jit/powerpc/asmpart.S, src/vm/jit/powerpc64/asmpart.S, src/vm/jit/s390/asmpart.S, src/vm/jit/sparc64/asmpart.S, src/vm/jit/x86_64/asmpart.S (asm_vm_call_method): Removed IsSync from method-header. * src/vm/jit/alpha/codegen.c, src/vm/jit/arm/codegen.c, src/vm/jit/i386/codegen.c, src/vm/jit/m68k/codegen.c, src/vm/jit/mips/codegen.c, src/vm/jit/powerpc/codegen.c, src/vm/jit/powerpc64/codegen.c, src/vm/jit/s390/codegen.c, src/vm/jit/sparc64/codegen.c, src/vm/jit/x86_64/codegen.c (codegen_emit): Removed IsSync-dummy entry. --- src/vm/jit/alpha/asmpart.S | 2 -- src/vm/jit/alpha/codegen.c | 3 --- src/vm/jit/arm/asmpart.S | 1 - src/vm/jit/arm/codegen.c | 3 --- src/vm/jit/arm/md.c | 2 +- src/vm/jit/dseg.c | 6 ------ src/vm/jit/i386/asmpart.S | 1 - src/vm/jit/i386/codegen.c | 3 --- src/vm/jit/m68k/asmpart.S | 1 - src/vm/jit/m68k/codegen.c | 3 --- src/vm/jit/methodheader.h | 37 +++++++++++++--------------------- src/vm/jit/mips/asmpart.S | 3 --- src/vm/jit/mips/codegen.c | 3 --- src/vm/jit/powerpc/asmpart.S | 1 - src/vm/jit/powerpc/codegen.c | 3 --- src/vm/jit/powerpc64/asmpart.S | 2 -- src/vm/jit/powerpc64/codegen.c | 3 --- src/vm/jit/s390/asmpart.S | 1 - src/vm/jit/s390/codegen.c | 3 --- src/vm/jit/sparc64/asmpart.S | 2 -- src/vm/jit/sparc64/codegen.c | 3 --- src/vm/jit/x86_64/asmpart.S | 2 -- src/vm/jit/x86_64/codegen.c | 3 --- 23 files changed, 15 insertions(+), 76 deletions(-) diff --git a/src/vm/jit/alpha/asmpart.S b/src/vm/jit/alpha/asmpart.S index ee37cb9a8..87ea3a092 100644 --- a/src/vm/jit/alpha/asmpart.S +++ b/src/vm/jit/alpha/asmpart.S @@ -87,11 +87,9 @@ .long 0 /* ALIGNMENT PADDING */ .quad 0 /* line number table start */ .quad 0 /* line number table size */ - .long 0 /* ALIGNMENT PADDING */ .long 0 /* fltsave */ .long 1 /* intsave */ .long 0 /* isleaf */ - .long 0 /* IsSync */ .long 0 /* frame size */ .quad 0 /* codeinfo pointer */ diff --git a/src/vm/jit/alpha/codegen.c b/src/vm/jit/alpha/codegen.c index ed9064e01..6062dee38 100644 --- a/src/vm/jit/alpha/codegen.c +++ b/src/vm/jit/alpha/codegen.c @@ -150,9 +150,6 @@ bool codegen_emit(jitdata *jd) code->synchronizedoffset = (rd->memuse + 1) * 8; - /* REMOVEME dummy IsSync */ - (void) dseg_add_unique_s4(cd, 0); - /* REMOVEME: We still need it for exception handling in assembler. */ if (code_is_leafmethod(code)) diff --git a/src/vm/jit/arm/asmpart.S b/src/vm/jit/arm/asmpart.S index 4e5952f2e..e84bc6731 100644 --- a/src/vm/jit/arm/asmpart.S +++ b/src/vm/jit/arm/asmpart.S @@ -81,7 +81,6 @@ .word 0 /* FltSave */ .word 0 /* IntSave */ .word 0 /* IsLeaf */ - .word 0 /* IsSync */ .word 0 /* FrameSize */ .word 0 /* CodeinfoPointer */ diff --git a/src/vm/jit/arm/codegen.c b/src/vm/jit/arm/codegen.c index abb5586a5..463d36576 100644 --- a/src/vm/jit/arm/codegen.c +++ b/src/vm/jit/arm/codegen.c @@ -156,9 +156,6 @@ bool codegen_emit(jitdata *jd) code->synchronizedoffset = rd->memuse * 8 + 4; - /* REMOVEME dummy IsSync */ - (void) dseg_add_unique_s4(cd, 0); - /* REMOVEME: We still need it for exception handling in assembler. */ if (code_is_leafmethod(code)) diff --git a/src/vm/jit/arm/md.c b/src/vm/jit/arm/md.c index 1af97dccd..e749926cf 100644 --- a/src/vm/jit/arm/md.c +++ b/src/vm/jit/arm/md.c @@ -203,7 +203,7 @@ u1 *md_codegen_get_pv_from_pc(u1 *ra) /* if we found our method the data segment has to be valid */ /* we check this by looking up the IsLeaf field, which has to be boolean */ - assert( *((s4*)pv-4) == (s4)true || *((s4*)pv-4) == (s4)false ); +/* assert( *((s4*)pv-8) == (s4)true || *((s4*)pv-8) == (s4)false ); */ return pv; } diff --git a/src/vm/jit/dseg.c b/src/vm/jit/dseg.c index f6079d09a..5a7d78cee 100644 --- a/src/vm/jit/dseg.c +++ b/src/vm/jit/dseg.c @@ -593,12 +593,6 @@ void dseg_add_target(codegendata *cd, basicblock *target) void dseg_addlinenumbertablesize(codegendata *cd) { -#if SIZEOF_VOID_P == 8 - /* 4-byte ALIGNMENT PADDING */ - - dseg_add_unique_s4(cd, 0); -#endif - cd->linenumbertablesizepos = dseg_add_unique_address(cd, NULL); cd->linenumbertablestartpos = dseg_add_unique_address(cd, NULL); diff --git a/src/vm/jit/i386/asmpart.S b/src/vm/jit/i386/asmpart.S index 112c9592c..c46ac2824 100644 --- a/src/vm/jit/i386/asmpart.S +++ b/src/vm/jit/i386/asmpart.S @@ -120,7 +120,6 @@ asm_md_init: .long 0 /* fltsave */ .long 0 /* intsave */ .long 0 /* isleaf */ - .long 0 /* IsSync */ .long 0 /* frame size */ .long 0 /* codeinfo pointer */ diff --git a/src/vm/jit/i386/codegen.c b/src/vm/jit/i386/codegen.c index b5ef6d947..7c168871d 100644 --- a/src/vm/jit/i386/codegen.c +++ b/src/vm/jit/i386/codegen.c @@ -164,9 +164,6 @@ bool codegen_emit(jitdata *jd) code->synchronizedoffset = (rd->memuse + 1) * 8; - /* REMOVEME dummy IsSync */ - (void) dseg_add_unique_s4(cd, 0); - /* REMOVEME: We still need it for exception handling in assembler. */ if (code_is_leafmethod(code)) diff --git a/src/vm/jit/m68k/asmpart.S b/src/vm/jit/m68k/asmpart.S index 22b2e9ae8..bf5ddd54a 100644 --- a/src/vm/jit/m68k/asmpart.S +++ b/src/vm/jit/m68k/asmpart.S @@ -73,7 +73,6 @@ .long 0 /* fltsave */ .long 0 /* intsave */ .long 0 /* isleaf */ - .long 0 /* IsSync */ .long 0 /* frame size */ .long 0 /* codeinfo pointer */ diff --git a/src/vm/jit/m68k/codegen.c b/src/vm/jit/m68k/codegen.c index d3d28007b..9f0f440f9 100644 --- a/src/vm/jit/m68k/codegen.c +++ b/src/vm/jit/m68k/codegen.c @@ -144,9 +144,6 @@ bool codegen_emit(jitdata *jd) code->synchronizedoffset = (rd->memuse + 1) * 8; - /* REMOVEME dummy IsSync */ - (void) dseg_add_unique_s4(cd, 0); - /* REMOVEME: We still need it for exception handling in assembler. */ if (code_is_leafmethod(code)) diff --git a/src/vm/jit/methodheader.h b/src/vm/jit/methodheader.h index 00029dfc2..466a83821 100644 --- a/src/vm/jit/methodheader.h +++ b/src/vm/jit/methodheader.h @@ -22,12 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Contact: cacao@cacaojvm.org - - Authors: Joseph Wenninger - - Changes: Christian Thalinger - */ @@ -43,29 +37,26 @@ #define CodeinfoPointer -8 #define FrameSize -12 -#define IsSync -16 -#define IsLeaf -20 -#define IntSave -24 -#define FltSave -28 -/* 4-byte alignment padding */ -#define LineNumberTableSize -40 -#define LineNumberTableStart -48 +#define IsLeaf -16 +#define IntSave -20 +#define FltSave -24 +#define LineNumberTableSize -32 +#define LineNumberTableStart -40 /* 4-byte alignment padding */ -#define ExTableSize -56 -#define ExTableStart -56 +#define ExTableSize -48 +#define ExTableStart -48 #else /* SIZEOF_VOID_P == 8 */ #define CodeinfoPointer -4 #define FrameSize -8 -#define IsSync -12 -#define IsLeaf -16 -#define IntSave -20 -#define FltSave -24 -#define LineNumberTableSize -28 -#define LineNumberTableStart -32 -#define ExTableSize -36 -#define ExTableStart -36 +#define IsLeaf -12 +#define IntSave -16 +#define FltSave -20 +#define LineNumberTableSize -24 +#define LineNumberTableStart -28 +#define ExTableSize -32 +#define ExTableStart -32 #endif /* SIZEOF_VOID_P == 8 */ diff --git a/src/vm/jit/mips/asmpart.S b/src/vm/jit/mips/asmpart.S index d69e59c62..99b23a1f0 100644 --- a/src/vm/jit/mips/asmpart.S +++ b/src/vm/jit/mips/asmpart.S @@ -91,11 +91,9 @@ .word 0 /* 4-byte ALIGNMENT PADDING */ .dword 0 /* line number table start */ .dword 0 /* line number table size */ - .word 0 /* 4-byte ALIGNMENT PADDING */ .word 0 /* fltsave */ .word 0 /* intsave */ .word 0 /* isleaf */ - .word 0 /* IsSync */ .word 0 /* frame size */ .dword 0 /* codeinfo pointer */ @@ -111,7 +109,6 @@ .word 0 /* fltsave */ .word 0 /* intsave */ .word 0 /* isleaf */ - .word 0 /* IsSync */ .word 0 /* frame size */ .word 0 /* method pointer (pointer to name) */ diff --git a/src/vm/jit/mips/codegen.c b/src/vm/jit/mips/codegen.c index 2fbf949e2..431dbf177 100644 --- a/src/vm/jit/mips/codegen.c +++ b/src/vm/jit/mips/codegen.c @@ -159,9 +159,6 @@ bool codegen_emit(jitdata *jd) code->synchronizedoffset = (rd->memuse + 1) * 8; - /* REMOVEME dummy IsSync */ - (void) dseg_add_unique_s4(cd, 0); - /* REMOVEME: We still need it for exception handling in assembler. */ if (code_is_leafmethod(code)) diff --git a/src/vm/jit/powerpc/asmpart.S b/src/vm/jit/powerpc/asmpart.S index 5ceff26ae..01f7ff7cc 100644 --- a/src/vm/jit/powerpc/asmpart.S +++ b/src/vm/jit/powerpc/asmpart.S @@ -87,7 +87,6 @@ .long 0 /* fltsave */ .long 0 /* intsave */ .long 0 /* IsLeaf */ - .long 0 /* IsSync */ .long 0 /* frame size */ .long 0 /* codeinfo pointer */ diff --git a/src/vm/jit/powerpc/codegen.c b/src/vm/jit/powerpc/codegen.c index 764b156a4..38a29a497 100644 --- a/src/vm/jit/powerpc/codegen.c +++ b/src/vm/jit/powerpc/codegen.c @@ -163,9 +163,6 @@ bool codegen_emit(jitdata *jd) code->synchronizedoffset = (rd->memuse + 1) * 8; - /* REMOVEME dummy IsSync */ - (void) dseg_add_unique_s4(cd, 0); - /* REMOVEME: We still need it for exception handling in assembler. */ if (code_is_leafmethod(code)) diff --git a/src/vm/jit/powerpc64/asmpart.S b/src/vm/jit/powerpc64/asmpart.S index 9d6aba9d2..dd9926d90 100644 --- a/src/vm/jit/powerpc64/asmpart.S +++ b/src/vm/jit/powerpc64/asmpart.S @@ -74,11 +74,9 @@ .long 0 /* ALIGNMENT PADDING */ .quad 0 /* line number table start */ .quad 0 /* line number table size */ - .long 0 /* ALIGNMENT PADDING */ .long 0 /* fltsave */ .long 0 /* intsave */ .long 0 /* isleaf */ - .long 0 /* IsSync */ .long 0 /* frame size */ .quad 0 /* codeinfo pointer */ diff --git a/src/vm/jit/powerpc64/codegen.c b/src/vm/jit/powerpc64/codegen.c index 0fe923374..b20cceaeb 100644 --- a/src/vm/jit/powerpc64/codegen.c +++ b/src/vm/jit/powerpc64/codegen.c @@ -165,9 +165,6 @@ bool codegen_emit(jitdata *jd) code->synchronizedoffset = (rd->memuse + 1) * 8; - /* REMOVEME dummy IsSync */ - (void) dseg_add_unique_s4(cd, 0); - /* REMOVEME: We still need it for exception handling in assembler. */ if (code_is_leafmethod(code)) diff --git a/src/vm/jit/s390/asmpart.S b/src/vm/jit/s390/asmpart.S index f7c996a2f..9e1ff9cbc 100644 --- a/src/vm/jit/s390/asmpart.S +++ b/src/vm/jit/s390/asmpart.S @@ -113,7 +113,6 @@ L_bras_##tag: .long 0 /* fltsave */ .long 0 /* intsave */ .long 0 /* IsLeaf */ - .long 0 /* IsSync */ .long 0 /* frame size */ .long 0 /* codeinfo pointer */ diff --git a/src/vm/jit/s390/codegen.c b/src/vm/jit/s390/codegen.c index bfe32a153..5b083baa5 100644 --- a/src/vm/jit/s390/codegen.c +++ b/src/vm/jit/s390/codegen.c @@ -215,9 +215,6 @@ bool codegen_emit(jitdata *jd) code->synchronizedoffset = (rd->memuse + 1) * 8; - /* REMOVEME dummy IsSync */ - (void) dseg_add_unique_s4(cd, 0); - /* REMOVEME: We still need it for exception handling in assembler. */ if (code_is_leafmethod(code)) diff --git a/src/vm/jit/sparc64/asmpart.S b/src/vm/jit/sparc64/asmpart.S index 30e64416f..ae8428453 100644 --- a/src/vm/jit/sparc64/asmpart.S +++ b/src/vm/jit/sparc64/asmpart.S @@ -80,11 +80,9 @@ .word 0 /* ALIGNMENT PADDING */ .xword 0 /* line number table start */ .xword 0 /* line number table size */ - .word 0 /* ALIGNMENT PADDING */ .word 0 /* fltsave */ .word 1 /* intsave */ .word 0 /* isleaf */ - .word 0 /* IsSync */ .word 0 /* frame size */ .xword 0 /* method pointer (pointer to name)*/ diff --git a/src/vm/jit/sparc64/codegen.c b/src/vm/jit/sparc64/codegen.c index 794b456a4..9c31a32eb 100644 --- a/src/vm/jit/sparc64/codegen.c +++ b/src/vm/jit/sparc64/codegen.c @@ -198,9 +198,6 @@ bool codegen_emit(jitdata *jd) code->synchronizedoffset = JITSTACK + (rd->memuse + 1) * 8; - /* REMOVEME dummy IsSync */ - (void) dseg_add_unique_s4(cd, 0); - /* REMOVEME: We still need it for exception handling in assembler. */ if (code_is_leafmethod(code)) diff --git a/src/vm/jit/x86_64/asmpart.S b/src/vm/jit/x86_64/asmpart.S index af15de533..d199a17d0 100644 --- a/src/vm/jit/x86_64/asmpart.S +++ b/src/vm/jit/x86_64/asmpart.S @@ -86,11 +86,9 @@ .long 0 /* ALIGNMENT PADDING */ .quad 0 /* line number table start */ .quad 0 /* line number table size */ - .long 0 /* ALIGNMENT PADDING */ .long 0 /* fltsave */ .long 0 /* intsave */ .long 0 /* isleaf */ - .long 0 /* IsSync */ .long 0 /* frame size */ .quad 0 /* codeinfo pointer */ diff --git a/src/vm/jit/x86_64/codegen.c b/src/vm/jit/x86_64/codegen.c index bb6a779a3..f9a3bc7cc 100644 --- a/src/vm/jit/x86_64/codegen.c +++ b/src/vm/jit/x86_64/codegen.c @@ -161,9 +161,6 @@ bool codegen_emit(jitdata *jd) code->synchronizedoffset = (rd->memuse + 1) * 8; - /* REMOVEME dummy IsSync */ - (void) dseg_add_unique_s4(cd, 0); - if (code_is_leafmethod(code)) (void) dseg_add_unique_s4(cd, 1); /* IsLeaf */ else -- 2.25.1