projects / cacao.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 54994e9)
* src/vm/jit/stack.c (stack_analyse): Removed USEBUILTINTABLE, always
authortwisti <none@none>
Thu, 12 Apr 2007 19:49:34 +0000 (19:49 +0000)
committertwisti <none@none>
Thu, 12 Apr 2007 19:49:34 +0000 (19:49 +0000)
check for automatic-builtins (compile this is not affected).

* src/vm/jit/alpha/arch.h,
src/vm/jit/arm/arch.h,
src/vm/jit/i386/arch.h,
src/vm/jit/m68k/arch.h,
src/vm/jit/mips/arch.h,
src/vm/jit/powerpc/arch.h,
src/vm/jit/powerpc64/arch.h,
src/vm/jit/s390/arch.h,
src/vm/jit/sparc64/arch.h,
src/vm/jit/x86_64/arch.h (USEBUILTINTABLE): Removed.

src/vm/jit/alpha/arch.h patch | blob | history
src/vm/jit/arm/arch.h patch | blob | history
src/vm/jit/i386/arch.h patch | blob | history
src/vm/jit/m68k/arch.h patch | blob | history
src/vm/jit/mips/arch.h patch | blob | history
src/vm/jit/powerpc/arch.h patch | blob | history
src/vm/jit/powerpc64/arch.h patch | blob | history
src/vm/jit/s390/arch.h patch | blob | history
src/vm/jit/sparc64/arch.h patch | blob | history
src/vm/jit/stack.c patch | blob | history
src/vm/jit/x86_64/arch.h patch | blob | history

diff --git a/src/vm/jit/alpha/arch.h b/src/vm/jit/alpha/arch.h
index c0d4f719ae91f8aedc45604156d705a84dcd7e7c..ae3ea3714294b88339be0550093c71d34304811a 100644 (file)
--- a/src/vm/jit/alpha/arch.h
+++ b/src/vm/jit/alpha/arch.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: arch.h 7596 2007-03-28 21:05:53Z twisti $
+   $Id: arch.h 7695 2007-04-12 19:49:34Z twisti $
 
 */
 
@@ -37,8 +37,6 @@
 
 #define U8_AVAILABLE                     1
 
-/*  #define USEBUILTINTABLE */
-
 #define SUPPORT_DIVISION                 0
 #define SUPPORT_LONG                     1
 
diff --git a/src/vm/jit/arm/arch.h b/src/vm/jit/arm/arch.h
index 2f0fd01c4c189178fa29fbf3b87d4ecb721f97be..70264ab5e13c953b476390e34b76d5974a5eb8e8 100644 (file)
--- a/src/vm/jit/arm/arch.h
+++ b/src/vm/jit/arm/arch.h
@@ -22,12 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Michael Starzinger
-            Christian Thalinger
-
-   $Id: arch.h 7596 2007-03-28 21:05:53Z twisti $
+   $Id: arch.h 7695 2007-04-12 19:49:34Z twisti $
 
 */
 
@@ -35,12 +30,13 @@
 #ifndef _ARCH_H
 #define _ARCH_H
 
+#include "config.h"
+
+
 /* define architecture features ***********************************************/
 
 #define U8_AVAILABLE                     1
 
-#define USEBUILTINTABLE
-
 #define SUPPORT_DIVISION                 0
 #define SUPPORT_LONG                     1
 
diff --git a/src/vm/jit/i386/arch.h b/src/vm/jit/i386/arch.h
index bbda7d6af646e505202047ac13711aa1f8c3e26a..22cd6de2e36f26b7db00e103373aefe497bf641d 100644 (file)
--- a/src/vm/jit/i386/arch.h
+++ b/src/vm/jit/i386/arch.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: arch.h 7596 2007-03-28 21:05:53Z twisti $
+   $Id: arch.h 7695 2007-04-12 19:49:34Z twisti $
 
 */
 
@@ -48,8 +48,6 @@
 
 #define U8_AVAILABLE                     1
 
-#define USEBUILTINTABLE
-
 #define SUPPORT_DIVISION                 1
 #define SUPPORT_LONG                     1
 
diff --git a/src/vm/jit/m68k/arch.h b/src/vm/jit/m68k/arch.h
index 583c008dacf5c0e2ae5d9759c06969aa252096d8..9173d190615774fcf1e3db8511967cd7479c4173 100644 (file)
--- a/src/vm/jit/m68k/arch.h
+++ b/src/vm/jit/m68k/arch.h
@@ -33,14 +33,10 @@
 #include "config.h"
 
 
-/*#define USE_FAKE_ATOMIC_INSTRUCTIONS         0 */
-
 /* define architecture features ***********************************************/
 
 #define U8_AVAILABLE                     1
 
-#define USEBUILTINTABLE
-
 #define SUPPORT_DIVISION                 0
 #define SUPPORT_LONG                     0
 
diff --git a/src/vm/jit/mips/arch.h b/src/vm/jit/mips/arch.h
index 4e3c01ac991b50a0f83a28764b4399f4d82d4cd1..002d468a02745d3d91fbaa09c752784d6cefa3fe 100644 (file)
--- a/src/vm/jit/mips/arch.h
+++ b/src/vm/jit/mips/arch.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: arch.h 7596 2007-03-28 21:05:53Z twisti $
+   $Id: arch.h 7695 2007-04-12 19:49:34Z twisti $
 
 */
 
@@ -37,8 +37,6 @@
 
 #define U8_AVAILABLE                     1
 
-#define USEBUILTINTABLE
-
 #if SIZEOF_VOID_P == 8
 
 #define SUPPORT_DIVISION                 1
diff --git a/src/vm/jit/powerpc/arch.h b/src/vm/jit/powerpc/arch.h
index 901008ffa95cfd6920bc238298693ccf6d76f1df..8ff6cd1c460f1af244ca55efc9a0522ca3be49a4 100644 (file)
--- a/src/vm/jit/powerpc/arch.h
+++ b/src/vm/jit/powerpc/arch.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: arch.h 7596 2007-03-28 21:05:53Z twisti $
+   $Id: arch.h 7695 2007-04-12 19:49:34Z twisti $
 
 */
 
@@ -37,8 +37,6 @@
 
 #define U8_AVAILABLE                     1
 
-#define USEBUILTINTABLE
-
 #define SUPPORT_DIVISION                 1
 #define SUPPORT_LONG                     1
 
diff --git a/src/vm/jit/powerpc64/arch.h b/src/vm/jit/powerpc64/arch.h
index 9b8de657a20605f6d8e984a1d28996783223e7be..a545e244bf47942d64fd826396893e8f37b8da5a 100644 (file)
--- a/src/vm/jit/powerpc64/arch.h
+++ b/src/vm/jit/powerpc64/arch.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: arch.h 7687 2007-04-11 16:39:22Z tbfg $
+   $Id: arch.h 7695 2007-04-12 19:49:34Z twisti $
 
 */
 
@@ -33,14 +33,10 @@
 #include "config.h"
 
 
-/*#define USE_FAKE_ATOMIC_INSTRUCTIONS         0 */
-
 /* define architecture features ***********************************************/
 
 #define U8_AVAILABLE                     1
 
-#define USEBUILTINTABLE
-
 #define SUPPORT_DIVISION                 1
 #define SUPPORT_LONG                     1
 
diff --git a/src/vm/jit/s390/arch.h b/src/vm/jit/s390/arch.h
index 68426c2c69cf7dcdff8eda3c1eb1abf9ded24335..e5f96bcd9e45acee77dc0ed3e133926200874c03 100644 (file)
--- a/src/vm/jit/s390/arch.h
+++ b/src/vm/jit/s390/arch.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: arch.h 7680 2007-04-10 05:02:20Z pm $
+   $Id: arch.h 7695 2007-04-12 19:49:34Z twisti $
 
 */
 
@@ -37,8 +37,6 @@
 
 #define U8_AVAILABLE                     1
 
-#define USEBUILTINTABLE 
-
 #define SUPPORT_DIVISION                 1
 #define SUPPORT_LONG                     1
 
diff --git a/src/vm/jit/sparc64/arch.h b/src/vm/jit/sparc64/arch.h
index 459ad892a8be55b2ef9dbb47c4fb658c7032f8f7..7cc3c511c7ea596ffdac4080599613d7fbd4453b 100644 (file)
--- a/src/vm/jit/sparc64/arch.h
+++ b/src/vm/jit/sparc64/arch.h
@@ -37,8 +37,6 @@
 
 #define U8_AVAILABLE                     1
 
-/*  #define USEBUILTINTABLE */
-
 #define SUPPORT_DIVISION                 0
 #define SUPPORT_LONG                     1
 
diff --git a/src/vm/jit/stack.c b/src/vm/jit/stack.c
index 938eea2128c36a0d6b3d94c769c6f774c5d00805..974c91630e4e9e8ddba388f8be1b0016988467ef 100644 (file)
--- a/src/vm/jit/stack.c
+++ b/src/vm/jit/stack.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: stack.c 7663 2007-04-04 22:14:42Z twisti $
+   $Id: stack.c 7695 2007-04-12 19:49:34Z twisti $
 
 */
 
@@ -2315,18 +2315,16 @@ bool stack_analyse(jitdata *jd)
 
                                        /* automatically replace some ICMDs with builtins */
 
-#if defined(USEBUILTINTABLE)
                                        bte = builtintable_get_automatic(opcode);
 
-                                       if (bte && bte->opcode == opcode) {
-                                               iptr->opc           = ICMD_BUILTIN;
+                                       if ((bte != NULL) && (bte->opcode == opcode)) {
+                                               iptr->opc            = ICMD_BUILTIN;
                                                iptr->flags.bits    &= INS_FLAG_ID_MASK;
-                                               iptr->sx.s23.s3.bte = bte;
+                                               iptr->sx.s23.s3.bte  = bte;
                                                /* iptr->line is already set */
-                                               jd->isleafmethod = false;
+                                               jd->isleafmethod     = false;
                                                goto icmd_BUILTIN;
                                        }
-#endif /* defined(USEBUILTINTABLE) */
 
                                        /* main opcode switch *************************************/
 
diff --git a/src/vm/jit/x86_64/arch.h b/src/vm/jit/x86_64/arch.h
index 4db3d27a94e5e8acd3c951665da094343b096224..8206e3698e1a0e78cc8c144a23563522417c1cb6 100644 (file)
--- a/src/vm/jit/x86_64/arch.h
+++ b/src/vm/jit/x86_64/arch.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: arch.h 7596 2007-03-28 21:05:53Z twisti $
+   $Id: arch.h 7695 2007-04-12 19:49:34Z twisti $
 
 */
 
@@ -37,8 +37,6 @@
 
 #define U8_AVAILABLE                     1
 
-/* #define USEBUILTINTABLE */
-
 #define SUPPORT_DIVISION                 1
 #define SUPPORT_LONG                     1
 
inofficial http://www.cacaojvm.org/ git mirror