Changeset 158541 in webkit

Timestamp:

Nov 3, 2013 1:52:56 PM (10 years ago)

Author:

mark.lam@apple.com

Message:

Assertion failure in non-JIT'ed LLInt on ARM Thumb.
​https://bugs.webkit.org/show_bug.cgi?id=97569.

Reviewed by Geoffrey Garen.

• assembler/MacroAssemblerCodeRef.h:
• Thumb2 alignment assertions do not apply to the C Loop LLINT because the arguments passed to those assertions are actually OpcodeIDs masquerading as addresses.
• llint/LLIntOfflineAsmConfig.h:
• Some of the #defines belong in the !ENABLE(LLINT_C_LOOP) section. Moving them there.
• llint/LowLevelInterpreter.cpp:
• Keep the compiler happy from some unreferenced C Loop labels.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/MacroAssemblerCodeRef.h (modified) (1 diff)
• llint/LLIntOfflineAsmConfig.h (modified) (4 diffs)
• llint/LowLevelInterpreter.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-11-02  Mark Lam  <mark.lam@apple.com>
+
+        Assertion failure in non-JIT'ed LLInt on ARM Thumb.
+        https://bugs.webkit.org/show_bug.cgi?id=97569.
+
+        Reviewed by Geoffrey Garen.
+
+        * assembler/MacroAssemblerCodeRef.h:
+        - Thumb2 alignment assertions do not apply to the C Loop LLINT because
+          the arguments passed to those assertions are actually OpcodeIDs
+          masquerading as addresses.
+        * llint/LLIntOfflineAsmConfig.h:
+        - Some of the #defines belong in the !ENABLE(LLINT_C_LOOP) section.
+          Moving them there.
+        * llint/LowLevelInterpreter.cpp:
+        - Keep the compiler happy from some unreferenced C Loop labels.
+
 2013-11-02  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h

@@ -37 +37 @@
 // ASSERT_VALID_CODE_POINTER checks that ptr is a non-null pointer, and that it is a valid
 // instruction address on the platform (for example, check any alignment requirements).
-#if CPU(ARM_THUMB2)
+#if CPU(ARM_THUMB2) && !ENABLE(LLINT_C_LOOP)
 // ARM/thumb instructions must be 16-bit aligned, but all code pointers to be loaded
 // into the processor are decorated with the bottom bit set, indicating that this is

trunk/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h

@@ -39 +39 @@
 #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_ARMv7s 0
@@ -97 +98 @@
 #endif
 
-#endif // !ENABLE(LLINT_C_LOOP)
-
 #if CPU(ARM64)
 #define OFFLINE_ASM_ARM64 1
@@ -104 +103 @@
 #define OFFLINE_ASM_ARM64 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 // !ENABLE(LLINT_C_LOOP)
 
 #if USE(JSVALUE64)
@@ -147 +161 @@
 #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

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp

@@ -91 +91 @@
 #define OFFLINE_ASM_END
 
-
-#define OFFLINE_ASM_OPCODE_LABEL(opcode) DEFINE_OPCODE(opcode)
+// To keep compilers happy in case of unused labels, force usage of the label:
+#define USE_LABEL(label) \
+    do { \
+        if (false) \
+            goto label; \
+    } while (false)
+
+#define OFFLINE_ASM_OPCODE_LABEL(opcode) DEFINE_OPCODE(opcode) USE_LABEL(opcode);
+
 #if ENABLE(COMPUTED_GOTO_OPCODES)
-    #define OFFLINE_ASM_GLUE_LABEL(label)  label:
+#define OFFLINE_ASM_GLUE_LABEL(label)  label: USE_LABEL(label);
 #else
-    #define OFFLINE_ASM_GLUE_LABEL(label)  case label: label:
-#endif
-
-#define OFFLINE_ASM_LOCAL_LABEL(label) \
-    label: \
-        if (false) \
-            goto label;
+#define OFFLINE_ASM_GLUE_LABEL(label)  case label: label: USE_LABEL(label);
+#endif
+
+#define OFFLINE_ASM_LOCAL_LABEL(label) label: USE_LABEL(label);