Changeset 38349 in webkit for trunk/JavaScriptCore/bytecompiler

Timestamp:

Nov 12, 2008, 4:48:23 PM (17 years ago)

Author:

[email protected]

Message:

2008-11-12 Geoffrey Garen <​[email protected]>

Reviewed by Sam Weinig.

Fixed ​https://bugs.webkit.org/show_bug.cgi?id=22192
+37 failures in fast/profiler

along with Darin's review comments in
​https://bugs.webkit.org/show_bug.cgi?id=22174
Simplified op_call by nixing its responsibility for moving the value of
"this" into the first argument slot

• VM/Machine.cpp: (JSC::returnToThrowTrampoline): (JSC::throwStackOverflowError): (JSC::Machine::cti_register_file_check): (JSC::Machine::cti_op_call_arityCheck): (JSC::Machine::cti_vm_throw): Moved the throw logic into a function, since functions are better than macros.

• bytecompiler/CodeGenerator.cpp: (JSC::CodeGenerator::emitCall): (JSC::CodeGenerator::emitConstruct): Ensure that the function register is preserved if profiling is enabled, since the profiler uses that register.

• runtime/JSGlobalData.h: Renamed throwReturnAddress to exceptionLocation, because I had a hard time understanding what "throwReturnAddress" meant.

Location:

trunk/JavaScriptCore/bytecompiler

Files:

• CodeGenerator.cpp (modified) (6 diffs)
• CodeGenerator.h (modified) (2 diffs)

trunk/JavaScriptCore/bytecompiler/CodeGenerator.cpp

@@ -1220 +1220 @@
 }
 
-RegisterID* CodeGenerator::emitCall(RegisterID* dst, RegisterID* func, RegisterID* base, ArgumentsNode* argumentsNode, unsigned divot, unsigned startOffset, unsigned endOffset)
-{
-    return emitCall(op_call, dst, func, base, argumentsNode, divot, startOffset, endOffset);
-}
-
-RegisterID* CodeGenerator::emitCallEval(RegisterID* dst, RegisterID* func, RegisterID* base, ArgumentsNode* argumentsNode, unsigned divot, unsigned startOffset, unsigned endOffset)
-{
-    return emitCall(op_call_eval, dst, func, base, argumentsNode, divot, startOffset, endOffset);
-}
-
-RegisterID* CodeGenerator::emitCall(OpcodeID opcodeID, RegisterID* dst, RegisterID* func, RegisterID* base, ArgumentsNode* argumentsNode, unsigned divot, unsigned startOffset, unsigned endOffset)
+RegisterID* CodeGenerator::emitCall(RegisterID* dst, RegisterID* func, RegisterID* thisRegister, ArgumentsNode* argumentsNode, unsigned divot, unsigned startOffset, unsigned endOffset)
+{
+    return emitCall(op_call, dst, func, thisRegister, argumentsNode, divot, startOffset, endOffset);
+}
+
+RegisterID* CodeGenerator::emitCallEval(RegisterID* dst, RegisterID* func, RegisterID* thisRegister, ArgumentsNode* argumentsNode, unsigned divot, unsigned startOffset, unsigned endOffset)
+{
+    return emitCall(op_call_eval, dst, func, thisRegister, argumentsNode, divot, startOffset, endOffset);
+}
+
+RegisterID* CodeGenerator::emitCall(OpcodeID opcodeID, RegisterID* dst, RegisterID* func, RegisterID* thisRegister, ArgumentsNode* argumentsNode, unsigned divot, unsigned startOffset, unsigned endOffset)
 {
     ASSERT(opcodeID == op_call || opcodeID == op_call_eval);
     ASSERT(func->refCount());
-    ASSERT(!base || base->refCount());
-    
+
+    if (m_shouldEmitProfileHooks) {
+        // If codegen decided to recycle func as this call's destination register,
+        // we need to undo that optimization here so that func will still be around
+        // for the sake of op_profile_did_call.
+        if (dst == func) {
+            RefPtr<RegisterID> protect = thisRegister;
+            RefPtr<RegisterID> movedThisRegister = emitMove(newTemporary(), thisRegister);
+            RefPtr<RegisterID> movedFunc = emitMove(thisRegister, func);
+            
+            thisRegister = movedThisRegister.release().releaseRef();
+            func = movedFunc.release().releaseRef();
+        }
+    }
+
     // Generate code for arguments.
     Vector<RefPtr<RegisterID>, 16> argv;
-    argv.append(newTemporary()); // reserve space for "this"
+    argv.append(thisRegister);
     for (ArgumentListNode* n = argumentsNode->m_listNode.get(); n; n = n->m_next.get()) {
         argv.append(newTemporary());
@@ -1256 +1269 @@
     emitExpressionInfo(divot, startOffset, endOffset);
     m_codeBlock->callLinkInfos.append(CallLinkInfo());
+
+    // Emit call.
     emitOpcode(opcodeID);
-    instructions().append(dst->index());
-    instructions().append(func->index());
-    instructions().append(base ? base->index() : missingThisObjectMarker()); // We encode the "this" value in the instruction stream, to avoid an explicit instruction for copying or loading it.
-    instructions().append(argv[0]->index()); // argv
-    instructions().append(argv.size()); // argc
+    instructions().append(dst->index()); // dst
+    instructions().append(func->index()); // func
+    instructions().append(argv.size()); // argCount
     instructions().append(argv[0]->index() + argv.size() + RegisterFile::CallFrameHeaderSize); // registerOffset
 
@@ -1267 +1280 @@
         emitOpcode(op_profile_did_call);
         instructions().append(func->index());
+
+        if (dst == func) {
+            thisRegister->deref();
+            func->deref();
+        }
     }
 
@@ -1293 +1311 @@
 {
     ASSERT(func->refCount());
+
+    if (m_shouldEmitProfileHooks) {
+        // If codegen decided to recycle func as this call's destination register,
+        // we need to undo that optimization here so that func will still be around
+        // for the sake of op_profile_did_call.
+        if (dst == func) {
+            RefPtr<RegisterID> movedFunc = emitMove(newTemporary(), func);
+            func = movedFunc.release().releaseRef();
+        }
+    }
 
     RefPtr<RegisterID> funcProto = newTemporary();
@@ -1320 +1348 @@
     emitExpressionInfo(divot, startOffset, endOffset);
     m_codeBlock->callLinkInfos.append(CallLinkInfo());
+
     emitOpcode(op_construct);
-    instructions().append(dst->index());
-    instructions().append(func->index());
-    instructions().append(funcProto->index());
-    instructions().append(argv[0]->index()); // argv
-    instructions().append(argv.size()); // argc
+    instructions().append(dst->index()); // dst
+    instructions().append(func->index()); // func
+    instructions().append(argv.size()); // argCount
     instructions().append(argv[0]->index() + argv.size() + RegisterFile::CallFrameHeaderSize); // registerOffset
+    instructions().append(funcProto->index()); // proto
+    instructions().append(argv[0]->index()); // thisRegister
 
     emitOpcode(op_construct_verify);
@@ -1335 +1364 @@
         emitOpcode(op_profile_did_call);
         instructions().append(func->index());
+        
+        if (dst == func)
+            func->deref();
     }
 

trunk/JavaScriptCore/bytecompiler/CodeGenerator.h

@@ -274 +274 @@
         RegisterID* emitPutSetter(RegisterID* base, const Identifier& property, RegisterID* value);
 
-        RegisterID* emitCall(RegisterID* dst, RegisterID* func, RegisterID* base, ArgumentsNode*, unsigned divot, unsigned startOffset, unsigned endOffset);
-        RegisterID* emitCallEval(RegisterID* dst, RegisterID* func, RegisterID* base, ArgumentsNode*, unsigned divot, unsigned startOffset, unsigned endOffset);
+        RegisterID* emitCall(RegisterID* dst, RegisterID* func, RegisterID* thisRegister, ArgumentsNode*, unsigned divot, unsigned startOffset, unsigned endOffset);
+        RegisterID* emitCallEval(RegisterID* dst, RegisterID* func, RegisterID* thisRegister, ArgumentsNode*, unsigned divot, unsigned startOffset, unsigned endOffset);
 
         RegisterID* emitReturn(RegisterID* src);
@@ -346 +346 @@
         typedef HashMap<UString::Rep*, JSString*, IdentifierRepHash> IdentifierStringMap;
 
-        RegisterID* emitCall(OpcodeID, RegisterID*, RegisterID*, RegisterID*, ArgumentsNode*, unsigned divot, unsigned startOffset, unsigned endOffset);
+        RegisterID* emitCall(OpcodeID, RegisterID* dst, RegisterID* func, RegisterID* thisRegister, ArgumentsNode*, unsigned divot, unsigned startOffset, unsigned endOffset);
         
         RegisterID* newRegister();