diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
| commit | 881da28418d380042aa95a97f0cbd42560a64f7c (patch) | |
| tree | a794dff3274695e99c651902dde93d934ea7a5af /Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h | |
| parent | 7e104c57a70fdf551bb3d22a5d637cdcbc69dbea (diff) | |
| parent | 0fcedcd17cc00d3dd44c718b3cb36c1033319671 (diff) | |
| download | qtwebkit-881da28418d380042aa95a97f0cbd42560a64f7c.tar.gz | |
Merge 'wip/next' into dev
Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9
Diffstat (limited to 'Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h')
| -rw-r--r-- | Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h | 90 |
1 files changed, 46 insertions, 44 deletions
diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h index 9010757b4..51ada4fbf 100644 --- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h +++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h @@ -29,30 +29,44 @@ #include "LLIntCommon.h" #include <wtf/Assertions.h> #include <wtf/InlineASM.h> -#include <wtf/Platform.h> - -#if ENABLE(LLINT_C_LOOP) +#if !ENABLE(JIT) #define OFFLINE_ASM_C_LOOP 1 #define OFFLINE_ASM_X86 0 +#define OFFLINE_ASM_X86_WIN 0 #define OFFLINE_ASM_ARM 0 #define OFFLINE_ASM_ARMv7 0 #define OFFLINE_ASM_ARMv7_TRADITIONAL 0 +#define OFFLINE_ASM_ARM64 0 #define OFFLINE_ASM_X86_64 0 +#define OFFLINE_ASM_X86_64_WIN 0 +#define OFFLINE_ASM_ARMv7k 0 #define OFFLINE_ASM_ARMv7s 0 #define OFFLINE_ASM_MIPS 0 #define OFFLINE_ASM_SH4 0 -#else // !ENABLE(LLINT_C_LOOP) +#else // ENABLE(JIT) #define OFFLINE_ASM_C_LOOP 0 -#if CPU(X86) +#if CPU(X86) && !COMPILER(MSVC) #define OFFLINE_ASM_X86 1 #else #define OFFLINE_ASM_X86 0 #endif +#if CPU(X86) && COMPILER(MSVC) +#define OFFLINE_ASM_X86_WIN 1 +#else +#define OFFLINE_ASM_X86_WIN 0 +#endif + +#ifdef __ARM_ARCH_7K__ +#define OFFLINE_ASM_ARMv7k 1 +#else +#define OFFLINE_ASM_ARMv7k 0 +#endif + #ifdef __ARM_ARCH_7S__ #define OFFLINE_ASM_ARMv7s 1 #else @@ -78,12 +92,18 @@ #define OFFLINE_ASM_ARM 0 #endif -#if CPU(X86_64) +#if CPU(X86_64) && !COMPILER(MSVC) #define OFFLINE_ASM_X86_64 1 #else #define OFFLINE_ASM_X86_64 0 #endif +#if CPU(X86_64) && COMPILER(MSVC) +#define OFFLINE_ASM_X86_64_WIN 1 +#else +#define OFFLINE_ASM_X86_64_WIN 0 +#endif + #if CPU(MIPS) #define OFFLINE_ASM_MIPS 1 #else @@ -96,18 +116,31 @@ #define OFFLINE_ASM_SH4 0 #endif -#endif // !ENABLE(LLINT_C_LOOP) +#if CPU(ARM64) +#define OFFLINE_ASM_ARM64 1 +#else +#define OFFLINE_ASM_ARM64 0 +#endif -#if USE(JSVALUE64) -#define OFFLINE_ASM_JSVALUE64 1 +#if CPU(MIPS) +#ifdef WTF_MIPS_PIC +#define S(x) #x +#define SX(x) S(x) +#define OFFLINE_ASM_CPLOAD(reg) \ + ".set noreorder\n" \ + ".cpload " SX(reg) "\n" \ + ".set reorder\n" #else -#define OFFLINE_ASM_JSVALUE64 0 +#define OFFLINE_ASM_CPLOAD(reg) +#endif #endif -#if USE(JSVALUE64) && OS(WINDOWS) -#define OFFLINE_ASM_WIN64 1 +#endif // ENABLE(JIT) + +#if USE(JSVALUE64) +#define OFFLINE_ASM_JSVALUE64 1 #else -#define OFFLINE_ASM_WIN64 0 +#define OFFLINE_ASM_JSVALUE64 0 #endif #if !ASSERT_DISABLED @@ -122,41 +155,10 @@ #define OFFLINE_ASM_BIG_ENDIAN 0 #endif -#if LLINT_OSR_TO_JIT -#define OFFLINE_ASM_JIT_ENABLED 1 -#else -#define OFFLINE_ASM_JIT_ENABLED 0 -#endif - #if LLINT_EXECUTION_TRACING #define OFFLINE_ASM_EXECUTION_TRACING 1 #else #define OFFLINE_ASM_EXECUTION_TRACING 0 #endif -#if LLINT_ALWAYS_ALLOCATE_SLOW -#define OFFLINE_ASM_ALWAYS_ALLOCATE_SLOW 1 -#else -#define OFFLINE_ASM_ALWAYS_ALLOCATE_SLOW 0 -#endif - -#if ENABLE(VALUE_PROFILER) -#define OFFLINE_ASM_VALUE_PROFILER 1 -#else -#define OFFLINE_ASM_VALUE_PROFILER 0 -#endif - -#if CPU(MIPS) -#ifdef WTF_MIPS_PIC -#define S(x) #x -#define SX(x) S(x) -#define OFFLINE_ASM_CPLOAD(reg) \ - ".set noreorder\n" \ - ".cpload " SX(reg) "\n" \ - ".set reorder\n" -#else -#define OFFLINE_ASM_CPLOAD(reg) -#endif -#endif - #endif // LLIntOfflineAsmConfig_h |