* src/vm/jit/replace.cpp: Use architectures STACKFRAME_RA_LINKAGE_AREA define.

* src/vm/jit/alpha/arch.h: Correctly set above define.
* src/vm/jit/arm/arch.h: Likewise.
* src/vm/jit/i386/arch.h: Likewise.
* src/vm/jit/m68k/arch.h: Likewise.
* src/vm/jit/mips/arch.h: Likewise.
* src/vm/jit/powerpc/arch.h: Likewise.
* src/vm/jit/powerpc64/arch.h: Likewise.
* src/vm/jit/replace.cpp: Likewise.
* src/vm/jit/s390/arch.h: Likewise.
* src/vm/jit/sparc64/arch.h: Likewise.
* src/vm/jit/x86_64/arch.h: Likewise.

diff --git a/src/vm/jit/alpha/arch.h b/src/vm/jit/alpha/arch.h
index e3f96f6a2e7d6a37ea95c087b268c5ebbf24c5ec..1a01e0ab314a965d9a2448cce837f5a7aff9f313 100644 (file)
--- a/src/vm/jit/alpha/arch.h
+++ b/src/vm/jit/alpha/arch.h
@@ -105,6 +105,7 @@
 
 #define STACKFRMAE_RA_BETWEEN_FRAMES              0
 #define STACKFRAME_RA_TOP_OF_FRAME                1
+#define STACKFRAME_RA_LINKAGE_AREA                0
 #define STACKFRAME_LEAFMETHODS_RA_REGISTER        1
 #define STACKFRAME_SYNC_NEEDS_TWO_SLOTS           0
 

diff --git a/src/vm/jit/arm/arch.h b/src/vm/jit/arm/arch.h
index 2d282f9570a5be8bd5c8456c2c7f72253051e2b8..1d0a49028630d30837437e70f6470efb5d82c77b 100644 (file)
--- a/src/vm/jit/arm/arch.h
+++ b/src/vm/jit/arm/arch.h
@@ -117,6 +117,7 @@
 
 #define STACKFRMAE_RA_BETWEEN_FRAMES              0
 #define STACKFRAME_RA_TOP_OF_FRAME                1
+#define STACKFRAME_RA_LINKAGE_AREA                0
 #define STACKFRAME_LEAFMETHODS_RA_REGISTER        1
 #define STACKFRAME_SYNC_NEEDS_TWO_SLOTS           0
 

diff --git a/src/vm/jit/i386/arch.h b/src/vm/jit/i386/arch.h
index 29c0603eab8a8d1ec2590f6a781fe83798ed6307..e9aef93f765f3e6116fcef3d051ee3511b70ee9b 100644 (file)
--- a/src/vm/jit/i386/arch.h
+++ b/src/vm/jit/i386/arch.h
@@ -137,6 +137,7 @@
 
 #define STACKFRMAE_RA_BETWEEN_FRAMES              1
 #define STACKFRAME_RA_TOP_OF_FRAME                0
+#define STACKFRAME_RA_LINKAGE_AREA                0
 #define STACKFRAME_LEAFMETHODS_RA_REGISTER        0
 #define STACKFRAME_SYNC_NEEDS_TWO_SLOTS           0
 

diff --git a/src/vm/jit/m68k/arch.h b/src/vm/jit/m68k/arch.h
index 77a189f2551d7dfc08f7eeceae95c202f23d91c0..e2b70b55fe26643a74a336f0c51df2924e22f0de 100644 (file)
--- a/src/vm/jit/m68k/arch.h
+++ b/src/vm/jit/m68k/arch.h
@@ -101,6 +101,7 @@
 
 #define STACKFRMAE_RA_BETWEEN_FRAMES              1
 #define STACKFRAME_RA_TOP_OF_FRAME                0
+#define STACKFRAME_RA_LINKAGE_AREA                0
 #define STACKFRAME_LEAFMETHODS_RA_REGISTER        0
 #define STACKFRAME_SYNC_NEEDS_TWO_SLOTS           1
 

diff --git a/src/vm/jit/mips/arch.h b/src/vm/jit/mips/arch.h
index 6f6cad855e203a893438580ce2f7ce998fb44ed9..7d6f1875e13224597ac03a5c98da646bf962b522 100644 (file)
--- a/src/vm/jit/mips/arch.h
+++ b/src/vm/jit/mips/arch.h
@@ -173,6 +173,7 @@
 
 #define STACKFRMAE_RA_BETWEEN_FRAMES              0
 #define STACKFRAME_RA_TOP_OF_FRAME                1
+#define STACKFRAME_RA_LINKAGE_AREA                0
 #define STACKFRAME_LEAFMETHODS_RA_REGISTER        1
 #define STACKFRAME_SYNC_NEEDS_TWO_SLOTS           1
 

diff --git a/src/vm/jit/powerpc/arch.h b/src/vm/jit/powerpc/arch.h
index 978f1facdbddaeebd3e3199cfb0b9d4b6ce89a67..6544790a22429b47c361bca15ac725ec9bc07841 100644 (file)
--- a/src/vm/jit/powerpc/arch.h
+++ b/src/vm/jit/powerpc/arch.h
@@ -113,6 +113,7 @@
 
 #define STACKFRMAE_RA_BETWEEN_FRAMES              0
 #define STACKFRAME_RA_TOP_OF_FRAME                0
+#define STACKFRAME_RA_LINKAGE_AREA                1
 #define STACKFRAME_LEAFMETHODS_RA_REGISTER        1
 #define STACKFRAME_SYNC_NEEDS_TWO_SLOTS           1
 

diff --git a/src/vm/jit/powerpc64/arch.h b/src/vm/jit/powerpc64/arch.h
index 0488a1d7c6eee658318700def09b58c1c8199aec..5d9469609ca5ad300c69413881948c8a5a743dff 100644 (file)
--- a/src/vm/jit/powerpc64/arch.h
+++ b/src/vm/jit/powerpc64/arch.h
@@ -97,6 +97,7 @@
 
 #define STACKFRMAE_RA_BETWEEN_FRAMES              0
 #define STACKFRAME_RA_TOP_OF_FRAME                0
+#define STACKFRAME_RA_LINKAGE_AREA                1
 #define STACKFRAME_LEAFMETHODS_RA_REGISTER        0
 #define STACKFRAME_SYNC_NEEDS_TWO_SLOTS           1
 

diff --git a/src/vm/jit/replace.cpp b/src/vm/jit/replace.cpp
index 12f1ba9e3ece34eb149190ac7aed3c6914791808..67878da59d2d4a8af0c9e90bf100f315f75b124e 100644 (file)
--- a/src/vm/jit/replace.cpp
+++ b/src/vm/jit/replace.cpp
@@ -71,16 +71,6 @@
 #include <vmlog_cacao.h>
 #endif
 
-/*** architecture-dependent configuration *************************************/
-
-/* first unset the macros (default) */
-#undef REPLACE_RA_LINKAGE_AREA
-
-/* powerpc */
-#if defined(__POWERPC__)
-# define REPLACE_RA_LINKAGE_AREA
-#endif
-
 
 /*** configuration of native stack slot size **********************************/
 
@@ -1527,12 +1517,12 @@ void md_pop_stackframe(executionstate_t *es)
                es->ra = (u1*) (ptrint) *--basesp;
 #endif /* STACKFRAME_RA_TOP_OF_FRAME */
 
-#if defined(REPLACE_RA_LINKAGE_AREA)
+#if STACKFRAME_RA_LINKAGE_AREA
 # if STACKFRAME_LEAFMETHODS_RA_REGISTER
        if (!code_is_leafmethod(es->code))
 # endif
                es->ra = *((uint8_t**) ((intptr_t) basesp + LA_LR_OFFSET));
-#endif /* REPLACE_RA_LINKAGE_AREA */
+#endif /* STACKFRAME_RA_LINKAGE_AREA */
 
        /* restore saved int registers */
 
@@ -1675,12 +1665,12 @@ void md_push_stackframe(executionstate_t *es, codeinfo *calleecode, u1 *ra)
                *--basesp = (ptrint) ra;
 #endif /* STACKFRAME_RA_TOP_OF_FRAME */
 
-#if defined(REPLACE_RA_LINKAGE_AREA)
+#if STACKFRAME_RA_LINKAGE_AREA
 # if STACKFRAME_LEAFMETHODS_RA_REGISTER
        if (!code_is_leafmethod(calleecode))
 # endif
                *((uint8_t**) ((intptr_t) basesp + LA_LR_OFFSET)) = ra;
-#endif /* REPLACE_RA_LINKAGE_AREA */
+#endif /* STACKFRAME_RA_LINKAGE_AREA */
 
        /* save int registers */
 

diff --git a/src/vm/jit/s390/arch.h b/src/vm/jit/s390/arch.h
index e5c26995547822fa8999df4bd5fe16537636fcbe..8259e04e60ead24035541d81dad21c7d3b84bfbc 100644 (file)
--- a/src/vm/jit/s390/arch.h
+++ b/src/vm/jit/s390/arch.h
@@ -105,6 +105,7 @@
 
 #define STACKFRMAE_RA_BETWEEN_FRAMES              0
 #define STACKFRAME_RA_TOP_OF_FRAME                1
+#define STACKFRAME_RA_LINKAGE_AREA                0
 #define STACKFRAME_LEAFMETHODS_RA_REGISTER        0
 #define STACKFRAME_SYNC_NEEDS_TWO_SLOTS           1
 

diff --git a/src/vm/jit/sparc64/arch.h b/src/vm/jit/sparc64/arch.h
index 48c674101ca8bf66fb34b78b1546a231026c73ae..0197ab4fe0c4e20d4cb9f0014279daf78d7f9d57 100644 (file)
--- a/src/vm/jit/sparc64/arch.h
+++ b/src/vm/jit/sparc64/arch.h
@@ -102,6 +102,7 @@
 #error Set the values below correctly!!!
 #define STACKFRMAE_RA_BETWEEN_FRAMES              0
 #define STACKFRAME_RA_TOP_OF_FRAME                0
+#define STACKFRAME_RA_LINKAGE_AREA                0
 #define STACKFRAME_LEAFMETHODS_RA_REGISTER        0
 #define STACKFRAME_SYNC_NEEDS_TWO_SLOTS           0
 

diff --git a/src/vm/jit/x86_64/arch.h b/src/vm/jit/x86_64/arch.h
index 80ac34246003c2bf23ac998e5450249c9dd45f9e..7e8457cce12678f1684f6e821d8ae61c0d0f018f 100644 (file)
--- a/src/vm/jit/x86_64/arch.h
+++ b/src/vm/jit/x86_64/arch.h
@@ -110,6 +110,7 @@
 
 #define STACKFRMAE_RA_BETWEEN_FRAMES              1
 #define STACKFRAME_RA_TOP_OF_FRAME                0
+#define STACKFRAME_RA_LINKAGE_AREA                0
 #define STACKFRAME_LEAFMETHODS_RA_REGISTER        0
 #define STACKFRAME_SYNC_NEEDS_TWO_SLOTS           0