Changeset 94688 in webkit for trunk/Source/JavaScriptCore/dfg

Timestamp:

Sep 7, 2011, 10:55:50 AM (14 years ago)

Author:

[email protected]

Message:

Refactor JIT checks for ObjectType into helper functions.

Rubber stamped by Sam Weinig.

• dfg/DFGJITCompiler.h:

(JSC::DFG::JITCompiler::branchIfNotObject):

• dfg/DFGNonSpeculativeJIT.cpp:

(JSC::DFG::NonSpeculativeJIT::compile):

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• jit/JIT.h:
• jit/JITCall32_64.cpp:

(JSC::JIT::emit_op_ret_object_or_this):

• jit/JITInlineMethods.h:

(JSC::JIT::emitJumpIfNotObject):

• jit/JITOpcodes.cpp:

(JSC::JIT::emit_op_instanceof):
(JSC::JIT::emit_op_ret_object_or_this):
(JSC::JIT::emit_op_get_pnames):
(JSC::JIT::emit_op_create_this):

• jit/JITOpcodes32_64.cpp:

(JSC::JIT::emit_op_instanceof):
(JSC::JIT::emit_op_get_pnames):
(JSC::JIT::emit_op_create_this):

Location:

trunk/Source/JavaScriptCore/dfg

Files:

• DFGJITCompiler.h (modified) (1 diff)
• DFGNonSpeculativeJIT.cpp (modified) (1 diff)
• DFGSpeculativeJIT.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.h

@@ -186 +186 @@
         return Address(GPRInfo::callFrameRegister, virtualRegister * sizeof(Register) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.payload));
     }
-    
+
+    Jump branchIfNotObject(GPRReg structureReg)
+    {
+        return branch8(NotEqual, Address(structureReg, Structure::typeInfoTypeOffset()), TrustedImm32(ObjectType));
+    }
+
     // Notify the JIT of a call that does not require linking.
     void notifyCall(Call call, unsigned exceptionInfo)

trunk/Source/JavaScriptCore/dfg/DFGNonSpeculativeJIT.cpp

@@ -1162 +1162 @@
         // Check that prototype is an object
         m_jit.loadPtr(MacroAssembler::Address(prototypeReg, JSCell::structureOffset()), scratchReg);
-        MacroAssembler::Jump protoNotObject = m_jit.branch8(MacroAssembler::NotEqual, MacroAssembler::Address(scratchReg, Structure::typeInfoTypeOffset()), MacroAssembler::TrustedImm32(ObjectType));
+        MacroAssembler::Jump protoNotObject = m_jit.branchIfNotObject(scratchReg);
 
         // Initialize scratchReg with the value being checked.

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

@@ -1304 +1304 @@
         // Check that prototype is an object.
         m_jit.loadPtr(MacroAssembler::Address(prototypeReg, JSCell::structureOffset()), scratchReg);
-        speculationCheck(m_jit.branch8(MacroAssembler::NotEqual, MacroAssembler::Address(scratchReg, Structure::typeInfoTypeOffset()), MacroAssembler::TrustedImm32(ObjectType)));
+        speculationCheck(m_jit.branchIfNotObject(scratchReg));
 
         // Initialize scratchReg with the value being checked.