Changeset 58907 in webkit for trunk/JavaScriptCore

Timestamp:

May 6, 2010, 1:47:22 PM (15 years ago)

Author:

[email protected]

Message:

Add compile switch to make debugger keyword plant breakpoint instructions.

Reviewed by Oliver Hunt.

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::emitDebugHook):

• jit/JITOpcodes.cpp:

(JSC::JIT::emit_op_debug):

• wtf/Platform.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecompiler/BytecodeGenerator.cpp (modified) (1 diff)
• jit/JITOpcodes.cpp (modified) (4 diffs)
• wtf/Platform.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-05-06  Gavin Barraclough  <[email protected]>
+
+        Reviewed by Oliver Hunt.
+
+        Add compile switch to make debugger keyword plant breakpoint instructions.
+
+        * bytecompiler/BytecodeGenerator.cpp:
+        (JSC::BytecodeGenerator::emitDebugHook):
+        * jit/JITOpcodes.cpp:
+        (JSC::JIT::emit_op_debug):
+        * wtf/Platform.h:
+
 2010-05-06  Oliver Hunt  <[email protected]>
 

trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -1632 +1632 @@
 void BytecodeGenerator::emitDebugHook(DebugHookID debugHookID, int firstLine, int lastLine)
 {
+#if ENABLE(DEBUG_WITH_BREAKPOINT)
+    if (debugHookID != DidReachBreakpoint)
+        return;
+#else
     if (!m_shouldEmitDebugHooks)
         return;
+#endif
     emitOpcode(op_debug);
     instructions().append(debugHookID);

trunk/JavaScriptCore/jit/JITOpcodes.cpp

@@ -1431 +1431 @@
 void JIT::emit_op_debug(Instruction* currentInstruction)
 {
+#if ENABLE(DEBUG_WITH_BREAKPOINT)
+    UNUSED_PARAM(currentInstruction);
+    breakpoint();
+#else
     JITStubCall stubCall(this, cti_op_debug);
     stubCall.addArgument(Imm32(currentInstruction[1].u.operand));
@@ -1436 +1440 @@
     stubCall.addArgument(Imm32(currentInstruction[3].u.operand));
     stubCall.call();
+#endif
 }
 
@@ -2722 +2727 @@
 void JIT::emit_op_debug(Instruction* currentInstruction)
 {
+#if ENABLE(DEBUG_WITH_BREAKPOINT)
+    UNUSED_PARAM(currentInstruction);
+    breakpoint();
+#else
     JITStubCall stubCall(this, cti_op_debug);
     stubCall.addArgument(Imm32(currentInstruction[1].u.operand));
@@ -2727 +2736 @@
     stubCall.addArgument(Imm32(currentInstruction[3].u.operand));
     stubCall.call();
+#endif
 }
 

trunk/JavaScriptCore/wtf/Platform.h

@@ -860 +860 @@
 #endif
 
-#define ENABLE_SAMPLING_COUNTERS 0
-#define ENABLE_SAMPLING_FLAGS 0
+#define ENABLE_DEBUG_WITH_BREAKPOINT 0
+#define ENABLE_SAMPLING_COUNTERS 1
+#define ENABLE_SAMPLING_FLAGS 1
 #define ENABLE_OPCODE_SAMPLING 0
 #define ENABLE_CODEBLOCK_SAMPLING 0