Changeset 161686 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Jan 10, 2014, 3:47:12 PM (11 years ago)

Author:

[email protected]

Message:

REGRESSION(C stack work): stack traces no longer work in CrashTracer, lldb, and other tools
​https://bugs.webkit.org/show_bug.cgi?id=126764

Reviewed by Geoffrey Garen.

Updated callToJavaScript and cllToNativeFunction to properly replicate the caller's
return PC and frame pointer in the sentinel frame. For X86-64, added .cfi_
directives to create eh_frame info for all LLInt symbols so that the various
unwinding code understands that we are using a separate JS stack referenced
by BP and at what offsets in that frame the prior PC (register 16) and prior
BP (register 6) can be found. These two changes are sufficient for stack tracing
to work for Mac OSX.

• llint/LowLevelInterpreter.cpp:
• llint/LowLevelInterpreter64.asm:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• llint/LowLevelInterpreter.cpp (modified) (2 diffs)
• llint/LowLevelInterpreter64.asm (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-01-10  Michael Saboff  <[email protected]>
+
+        REGRESSION(C stack work): stack traces no longer work in CrashTracer, lldb, and other tools
+        https://bugs.webkit.org/show_bug.cgi?id=126764
+
+        Reviewed by Geoffrey Garen.
+
+        Updated callToJavaScript and cllToNativeFunction to properly replicate the caller's
+        return PC and frame pointer in the sentinel frame.  For X86-64, added .cfi_
+        directives to create eh_frame info for all LLInt symbols so that the various
+        unwinding code understands that we are using a separate JS stack referenced
+        by BP and at what offsets in that frame the prior PC (register 16) and prior
+        BP (register 6) can be found.  These two changes are sufficient for stack tracing
+        to work for Mac OSX.
+
+        * llint/LowLevelInterpreter.cpp:
+        * llint/LowLevelInterpreter64.asm:
+
 2014-01-10  Tamas Gergely  <[email protected]>
 

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp

@@ -523 +523 @@
 
 // These are for building an interpreter from generated assembly code:
+#if CPU(X86_64)
+#define OFFLINE_ASM_BEGIN   asm ( \
+    ".cfi_startproc\n"
+
+#define OFFLINE_ASM_END     \
+    ".cfi_endproc\n" \
+);
+#else
 #define OFFLINE_ASM_BEGIN   asm (
 #define OFFLINE_ASM_END     );
+#endif
 
 #define OFFLINE_ASM_OPCODE_LABEL(__opcode) OFFLINE_ASM_GLOBAL_LABEL(llint_##__opcode)
@@ -537 +546 @@
     ".thumb_func " THUMB_FUNC_PARAM(label) "\n"  \
     SYMBOL_STRING(label) ":\n"
+#elif CPU(X86_64)
+#define OFFLINE_ASM_GLOBAL_LABEL(label)         \
+    ".text\n"                                   \
+    ".globl " SYMBOL_STRING(label) "\n"         \
+    HIDE_SYMBOL(label) "\n"                     \
+    SYMBOL_STRING(label) ":\n"                  \
+    ".cfi_def_cfa rbp, 0\n"                     \
+    ".cfi_offset 16, 8\n"                       \
+    ".cfi_offset 6, 0\n"
 #else
 #define OFFLINE_ASM_GLOBAL_LABEL(label)         \

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm

@@ -141 +141 @@
     end
 
-    if X86_64
-        loadp [sp], previousPC
-    end
-    move cfr, previousCFR
     functionPrologue(extraStackSpace)
 
@@ -154 +150 @@
     storep temp1, ScopeChain[cfr]
     storep 1, CodeBlock[cfr]
+    if X86_64
+        loadp 7*8[sp], previousPC
+        loadp 6*8[sp], previousCFR
+    end
     storep previousPC, ReturnPC[cfr]
     storep previousCFR, CallerFrame[cfr]