* 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.

diff --git a/src/vm/jit/alpha/asmpart.S b/src/vm/jit/alpha/asmpart.S
index ee37cb9a8dbcecd5744d8a2920fd9ea42e16f758..87ea3a0929112a33e189c301ed47cd9d283444b5 100644 (file)
--- 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 ed9064e01f4aa213a3ddccdc015a6ef36092fa0f..6062dee38c739cc766cd91a2a966b64d85c98dd8 100644 (file)
--- 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 4e5952f2e280dd9cf8b27a3a413f1fc09fcbaa89..e84bc67318ff8e6eca64980cfdbcf65ea8e35dfd 100644 (file)
--- 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 abb5586a5ba05d9fc25f56c39b2b277fbf01c2b4..463d36576c4aeadc9d811491c72adc243fb3c890 100644 (file)
--- 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 1af97dccdfaa2438b1016742d97170544dbb9b85..e749926cfb967aab9f4f9f29589462eb92c6bb96 100644 (file)
--- 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 f6079d09aded9b3d8174a99e16aaa321875054b4..5a7d78cee92b5fd497314a5e43cddfec40c4d765 100644 (file)
--- 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 112c9592c711a3f3a0bc82ce2efea93672aed175..c46ac2824ccf419d6a204895a05fb932b0e56d07 100644 (file)
--- 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 b5ef6d947486c775341ed437a5447b007c2d101a..7c168871d19ac7e2d6a17c0f20ccbc7847be3100 100644 (file)
--- 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 22b2e9ae80502783b60ee0275449fb5df250e6db..bf5ddd54a71cc035d5db47287ef1f1aaea075263 100644 (file)
--- 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 d3d28007b64f3f7d8f4368e8243f723a4df26910..9f0f440f92032fb401b3824cce576823b5f5f172 100644 (file)
--- 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 00029dfc243ab45382313b19d50d949899fa8801..466a83821e3044f521a61b03bc96773ffed2ddbd 100644 (file)
--- 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 d69e59c6287a1ea4c9509738101d7a3652c2f3ee..99b23a1f0a1d7c5e5ed697b8c02b0360bf9c9e0a 100644 (file)
--- 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 2fbf949e27e424dae1c8eb37c651ea84827756e2..431dbf1779151600f0f452c226595f25f1ba2af1 100644 (file)
--- 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 5ceff26ae19105e732b631ad823d7da4f5f8ac15..01f7ff7cc1aca95a057f1866c2ffeda905a2fe89 100644 (file)
--- 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 764b156a4ab14a585519cfc555d1c195ef883a3d..38a29a4972af21c11595568d206a932a1279ba4c 100644 (file)
--- 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 9d6aba9d2e9ff9bb8df1425200a07125692a8c30..dd9926d90038f06fa78deff8b3d1e6560f9fe1a8 100644 (file)
--- 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 0fe923374b79bb83b006bbc811bd65a9d4665ef2..b20cceaebf152fbe710c755f737ac9865de297d8 100644 (file)
--- 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 f7c996a2fa07b1575a6c06609631c4ef07559d76..9e1ff9cbcdfa0e286b0730025c7dde36fcf3c2ed 100644 (file)
--- 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 bfe32a153babca2a7750ea4f2debbeabfb0ca8b2..5b083baa5a8f495ccab71d947607e7f38157ac99 100644 (file)
--- 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 30e64416f719ea624fc4234afe5ae89b78a68057..ae8428453dda77a27b44e6ef1005be67cae483c1 100644 (file)
--- 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 794b456a48549981439cb8ea4780f2472291c37a..9c31a32eb718d858418fcc5e76c4ba8894622e06 100644 (file)
--- 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 af15de533c1ac9baa4a58e5d1cad24dbcd3ea964..d199a17d0f369661d4a682fa4a73bf400cee74d7 100644 (file)
--- 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 bb6a779a3d0a01bccc88f1feb49e11202cc4fe05..f9a3bc7cc16cfe0c34690e8cc35329f55f48234c 100644 (file)
--- 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