From: twisti Date: Thu, 12 Apr 2007 19:49:34 +0000 (+0000) Subject: * src/vm/jit/stack.c (stack_analyse): Removed USEBUILTINTABLE, always X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=b62e5953189928c118c63f2e3eabdd60ebf9da9f;p=cacao.git * src/vm/jit/stack.c (stack_analyse): Removed USEBUILTINTABLE, always 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. --- diff --git a/src/vm/jit/alpha/arch.h b/src/vm/jit/alpha/arch.h index c0d4f719a..ae3ea3714 100644 --- 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 2f0fd01c4..70264ab5e 100644 --- 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 bbda7d6af..22cd6de2e 100644 --- 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 583c008da..9173d1906 100644 --- 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 4e3c01ac9..002d468a0 100644 --- 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 901008ffa..8ff6cd1c4 100644 --- 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 9b8de657a..a545e244b 100644 --- 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 68426c2c6..e5f96bcd9 100644 --- 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 459ad892a..7cc3c511c 100644 --- 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 938eea212..974c91630 100644 --- 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 4db3d27a9..8206e3698 100644 --- 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