Bug 517328 - NJ merge: copy changes to nanojit insulation layer, r=dvander.

--HG--
extra : rebase_source : 02c89206ca735a23a5633a2c4fa0d7522c9cdddc
This commit is contained in:
Graydon Hoare 2009-09-17 15:02:30 -07:00
parent b913a7c1a7
commit 7dded2b745
2 changed files with 28 additions and 13 deletions

View File

@ -2471,6 +2471,7 @@ i?86-*)
;;
x86_64*-*)
AC_DEFINE(AVMPLUS_AMD64)
AC_DEFINE(AVMPLUS_64BIT)
;;
arm*-*)
AC_DEFINE(AVMPLUS_ARM)

40
js/src/nanojit/nanojit.h Executable file → Normal file
View File

@ -45,19 +45,30 @@
#ifdef FEATURE_NANOJIT
#ifdef AVMPLUS_IA32
#define NANOJIT_IA32
#elif AVMPLUS_ARM
#define NANOJIT_ARM
#elif AVMPLUS_PPC
#define NANOJIT_PPC
#elif AVMPLUS_SPARC
#define NANOJIT_SPARC
#elif AVMPLUS_AMD64
#define NANOJIT_X64
#define NANOJIT_64BIT
#if defined AVMPLUS_IA32
#define NANOJIT_IA32
#elif defined AVMPLUS_ARM
#define NANOJIT_ARM
#elif defined AVMPLUS_PPC
#define NANOJIT_PPC
#elif defined AVMPLUS_SPARC
#define NANOJIT_SPARC
#elif defined AVMPLUS_AMD64
#define NANOJIT_X64
#else
#error "unknown nanojit architecture"
#error "unknown nanojit architecture"
#endif
#ifdef AVMPLUS_64BIT
#define NANOJIT_64BIT
#endif
#if defined NANOJIT_64BIT
#define IF_64BIT(...) __VA_ARGS__
#define UNLESS_64BIT(...)
#else
#define IF_64BIT(...)
#define UNLESS_64BIT(...) __VA_ARGS__
#endif
// Embed no-op macros that let Valgrind work with the JIT.
@ -77,7 +88,6 @@ namespace nanojit
* START AVM bridging definitions
* -------------------------------------------
*/
class Fragment;
typedef avmplus::AvmCore AvmCore;
typedef avmplus::OSDep OSDep;
@ -128,9 +138,13 @@ namespace nanojit
}
#ifdef AVMPLUS_VERBOSE
#ifndef NJ_VERBOSE_DISABLED
#define NJ_VERBOSE 1
#endif
#ifndef NJ_PROFILE_DISABLED
#define NJ_PROFILE 1
#endif
#endif
#ifdef MOZ_NO_VARADIC_MACROS
#include <stdio.h>