Changeset 49293 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 8, 2009, 2:18:21 AM (16 years ago)

Author:

[email protected]

Message:

Fix for JIT'ed op_call instructions (evals, constructs, etc.)
when !ENABLE(JIT_OPTIMIZE_CALL) && USE(JSVALUE32_64)

Patch by Zoltan Herczeg <​[email protected]> on 2009-10-08
Reviewed by Gavin Barraclough.

​https://bugs.webkit.org/show_bug.cgi?id=30201

• jit/JITCall.cpp:

(JSC::JIT::compileOpCall):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JITCall.cpp (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-10-08  Zoltan Herczeg  <[email protected]>
+
+        Reviewed by Gavin Barraclough.
+
+        Fix for JIT'ed op_call instructions (evals, constructs, etc.)
+        when !ENABLE(JIT_OPTIMIZE_CALL) && USE(JSVALUE32_64)
+
+        https://bugs.webkit.org/show_bug.cgi?id=30201
+
+        * jit/JITCall.cpp:
+        (JSC::JIT::compileOpCall):
+
 2009-10-07  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/jit/JITCall.cpp

@@ -244 +244 @@
         stubCall.addArgument(JIT::Imm32(argCount));
         stubCall.call();
-        wasEval = branch32(Equal, regT1, Imm32(JSValue::EmptyValueTag));
-    }
-
-    emitLoad(callee, regT1, regT2);
+        wasEval = branch32(NotEqual, regT1, Imm32(JSValue::EmptyValueTag));
+    }
+
+    emitLoad(callee, regT1, regT0);
 
     if (opcodeID == op_call)
@@ -255 +255 @@
 
     emitJumpSlowCaseIfNotJSCell(callee, regT1);
-    addSlowCase(branchPtr(NotEqual, Address(regT2), ImmPtr(m_globalData->jsFunctionVPtr)));
+    addSlowCase(branchPtr(NotEqual, Address(regT0), ImmPtr(m_globalData->jsFunctionVPtr)));
 
     // First, in the case of a construct, allocate the new object.
     if (opcodeID == op_construct) {
         JITStubCall(this, cti_op_construct_JSConstruct).call(registerOffset - RegisterFile::CallFrameHeaderSize - argCount);
-        emitLoad(callee, regT1, regT2);
+        emitLoad(callee, regT1, regT0);
     }
 
@@ -273 +273 @@
         wasEval.link(this);
 
-    emitStore(dst, regT1, regT0);;
+    emitStore(dst, regT1, regT0);
 
     sampleCodeBlock(m_codeBlock);