Changeset 39351 in webkit for trunk/JavaScriptCore

Timestamp:

Dec 16, 2008, 6:34:59 PM (16 years ago)

Author:

[email protected]

Message:

2008-12-16 Sam Weinig <​[email protected]>

Reviewed by Gavin Barraclough.

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=22837
Remove dependency on the bytecode Instruction buffer in Interpreter::cti_op_call_NotJSFunction
Part of <rdar://problem/6428342>

• interpreter/CallFrame.h: Added comment regarding returnPC storing a void*.
• interpreter/Interpreter.cpp: (JSC::bytecodeOffsetForPC): We no longer have any cases of the PC being in the instruction stream for JIT, so we can remove the check. (JSC::Interpreter::cti_op_call_NotJSFunction): Use the CTI_RETURN_ADDRESS as the call frame returnPC as it is only necessary for looking up when throwing an exception.
• interpreter/RegisterFile.h: (JSC::RegisterFile::): Added comment regarding returnPC storing a void*.
• jit/JIT.h: Remove ARG_instr4.
• jit/JITCall.cpp: (JSC::JIT::compileOpCallSetupArgs): Don't pass the instruction pointer.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• interpreter/CallFrame.h (modified) (1 diff)
• interpreter/Interpreter.cpp (modified) (2 diffs)
• interpreter/RegisterFile.h (modified) (1 diff)
• jit/JIT.h (modified) (1 diff)
• jit/JITCall.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-12-16  Sam Weinig  <[email protected]>
+
+        Reviewed by Gavin Barraclough.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=22837
+        Remove dependency on the bytecode Instruction buffer in Interpreter::cti_op_call_NotJSFunction
+        Part of <rdar://problem/6428342>
+
+        * interpreter/CallFrame.h: Added comment regarding returnPC storing a void*.
+        * interpreter/Interpreter.cpp:
+        (JSC::bytecodeOffsetForPC): We no longer have any cases of the PC
+        being in the instruction stream for JIT, so we can remove the check.
+        (JSC::Interpreter::cti_op_call_NotJSFunction): Use the CTI_RETURN_ADDRESS
+        as the call frame returnPC as it is only necessary for looking up when
+        throwing an exception.
+        * interpreter/RegisterFile.h:
+        (JSC::RegisterFile::): Added comment regarding returnPC storing a void*.
+        * jit/JIT.h: Remove ARG_instr4.
+        * jit/JITCall.cpp:
+        (JSC::JIT::compileOpCallSetupArgs): Don't pass the instruction pointer.
+
 2008-12-16  Darin Adler  <[email protected]>
 

trunk/JavaScriptCore/interpreter/CallFrame.h

@@ -125 +125 @@
             setScopeChain(scopeChain);
             setCallerFrame(callerFrame);
-            this[RegisterFile::ReturnPC] = vPC;
+            this[RegisterFile::ReturnPC] = vPC; // This is either an Instruction* or a pointer into JIT generated code stored as an Instruction*.
             this[RegisterFile::ReturnValueRegister] = returnValueRegister;
             setArgumentCount(argc); // original argument count (for the sake of the "arguments" object)

trunk/JavaScriptCore/interpreter/Interpreter.cpp

@@ -92 +92 @@
 {
 #if ENABLE(JIT)
-    if (pc >= codeBlock->instructions().begin() && pc < codeBlock->instructions().end())
-        return static_cast<Instruction*>(pc) - codeBlock->instructions().begin();
     return codeBlock->getBytecodeIndex(pc);
 #else
@@ -4916 +4914 @@
         CallFrame* callFrame = CallFrame::create(previousCallFrame->registers() + registerOffset);
 
-        callFrame->init(0, ARG_instr4 + 1, previousCallFrame->scopeChain(), previousCallFrame, 0, argCount, 0);
+        callFrame->init(0, static_cast<Instruction*>(CTI_RETURN_ADDRESS), previousCallFrame->scopeChain(), previousCallFrame, 0, argCount, 0);
         ARG_setCallFrame(callFrame);
 

trunk/JavaScriptCore/interpreter/RegisterFile.h

@@ -100 +100 @@
             ScopeChain = -7,
             CallerFrame = -6,
-            ReturnPC = -5,
+            ReturnPC = -5, // This is either an Instruction* or a pointer into JIT generated code stored as an Instruction*.
             ReturnValueRegister = -4,
             ArgumentCount = -3,

trunk/JavaScriptCore/jit/JIT.h

@@ -75 +75 @@
 #define ARG_regexp1 static_cast<RegExp*>(ARGS[1])
 #define ARG_pni1 static_cast<JSPropertyNameIterator*>(ARGS[1])
-#define ARG_instr4 static_cast<Instruction*>(ARGS[4])
 #define ARG_returnAddress2 static_cast<void*>(ARGS[2])
 #define ARG_codeBlock4 static_cast<CodeBlock*>(ARGS[4])

trunk/JavaScriptCore/jit/JITCall.cpp

@@ -92 +92 @@
     emitPutJITStubArgConstant(registerOffset, 2);
     emitPutJITStubArgConstant(argCount, 3);
-    emitPutJITStubArgConstant(instruction, 4);
 }