Changeset 39265 in webkit for trunk/JavaScriptCore/jit

Timestamp:

Dec 12, 2008, 7:03:07 PM (16 years ago)

Author:

[email protected]

Message:

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

Reviewed by Cameron Zwarich.

<rdar://problem/6428342> Look into feasibility of discarding bytecode after native codegen

Move more JIT functionality to using offsets into the Instruction buffer
instead of raw pointers. Two to go!

• interpreter/Interpreter.cpp: (JSC::bytecodeOffsetForPC): Rename from vPCForPC. (JSC::Interpreter::resolve): Pass offset to exception helper. (JSC::Interpreter::resolveSkip): Ditto. (JSC::Interpreter::resolveGlobal): Ditto. (JSC::Interpreter::resolveBaseAndProperty): Ditto. (JSC::Interpreter::resolveBaseAndFunc): Ditto. (JSC::isNotObject): Ditto. (JSC::Interpreter::unwindCallFrame): Call bytecodeOffsetForPC. (JSC::Interpreter::throwException): Use offsets instead of vPCs. (JSC::Interpreter::privateExecute): Pass offset to exception helper. (JSC::Interpreter::retrieveLastCaller): Ditto. (JSC::Interpreter::cti_op_instanceof): Ditto. (JSC::Interpreter::cti_op_call_NotJSFunction): Ditto. (JSC::Interpreter::cti_op_resolve): Pass offset to exception helper. (JSC::Interpreter::cti_op_construct_NotJSConstruct): Ditto. (JSC::Interpreter::cti_op_resolve_func): Ditto. (JSC::Interpreter::cti_op_resolve_skip): Ditto. (JSC::Interpreter::cti_op_resolve_global): Ditto. (JSC::Interpreter::cti_op_resolve_with_base): Ditto. (JSC::Interpreter::cti_op_throw): Ditto. (JSC::Interpreter::cti_op_in): Ditto. (JSC::Interpreter::cti_vm_throw): Ditto.
• interpreter/Interpreter.h:

• jit/JIT.cpp: (JSC::JIT::privateCompileMainPass): Don't pass unnecessary vPC to stub.
• jit/JIT.h: Remove ARG_instr1 - ARG_instr3 and ARG_instr5 - ARG_instr6.
• jit/JITCall.cpp: (JSC::JIT::compileOpCallEvalSetupArgs): Don't pass unnecessary vPC to stub.. (JSC::JIT::compileOpConstructSetupArgs): Ditto.

• runtime/ExceptionHelpers.cpp: (JSC::createUndefinedVariableError): Take an offset instead of vPC. (JSC::createInvalidParamError): Ditto. (JSC::createNotAConstructorError): Ditto. (JSC::createNotAFunctionError): Ditto. (JSC::createNotAnObjectError): Ditto.
• runtime/ExceptionHelpers.h:

Location:

trunk/JavaScriptCore/jit

Files:

• JIT.cpp (modified) (1 diff)
• JIT.h (modified) (1 diff)
• JITCall.cpp (modified) (2 diffs)

trunk/JavaScriptCore/jit/JIT.cpp

@@ -722 +722 @@
             emitPutCTIArgConstant(reinterpret_cast<unsigned>(ident), 4);
             emitPutCTIArgConstant(currentIndex, 8);
-            emitPutCTIArgConstant(reinterpret_cast<unsigned>(instruction + i), 12);
             emitCTICall(i, Interpreter::cti_op_resolve_global);
             emitPutVirtualRegister(instruction[i + 1].u.operand);

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_instr1 static_cast<Instruction*>(ARGS[1])
-#define ARG_instr2 static_cast<Instruction*>(ARGS[2])
-#define ARG_instr3 static_cast<Instruction*>(ARGS[3])
 #define ARG_instr4 static_cast<Instruction*>(ARGS[4])
-#define ARG_instr5 static_cast<Instruction*>(ARGS[5])
-#define ARG_instr6 static_cast<Instruction*>(ARGS[6])
 #define ARG_returnAddress2 static_cast<void*>(ARGS[2])
 #define ARG_codeBlock4 static_cast<CodeBlock*>(ARGS[4])

trunk/JavaScriptCore/jit/JITCall.cpp

@@ -102 +102 @@
     emitPutCTIArgConstant(registerOffset, 4);
     emitPutCTIArgConstant(argCount, 8);
-    emitPutCTIArgConstant(reinterpret_cast<unsigned>(instruction), 12);
 }
 
@@ -118 +117 @@
     emitPutCTIArgFromVirtualRegister(proto, 12, X86::eax);
     emitPutCTIArgConstant(thisRegister, 16);
-    emitPutCTIArgConstant(reinterpret_cast<unsigned>(instruction), 20);
 }