Changeset 44711 in webkit for trunk/JavaScriptCore/bytecode

Timestamp:

Jun 15, 2009, 10:35:32 PM (16 years ago)

Author:

[email protected]

Message:

2009-06-15 Gavin Barraclough <​[email protected]>

Reviewed by Sam Weinig.

Having moved most of their functionality into the RepatchBuffer class,
we can simplify the CodeLocation* classes.

The CodeLocation* classes are currently a tangle of templatey and friendly
badness, burried in the middle of AbstractMacroAssembler. Having moved
the ability to repatch out into RepatchBufer they are now do-nothing wrappers
on CodePtr (MacroAssemblerCodePtr), that only exist to provide type-safety.

Simplify the code, and move them off into their own header.

• JavaScriptCore.xcodeproj/project.pbxproj:
• assembler/AbstractMacroAssembler.h: (JSC::AbstractMacroAssembler::PatchBuffer::patch):
• assembler/CodeLocation.h: Copied from assembler/AbstractMacroAssembler.h. (JSC::CodeLocationCommon::CodeLocationCommon): (JSC::CodeLocationInstruction::CodeLocationInstruction): (JSC::CodeLocationLabel::CodeLocationLabel): (JSC::CodeLocationJump::CodeLocationJump): (JSC::CodeLocationCall::CodeLocationCall): (JSC::CodeLocationNearCall::CodeLocationNearCall): (JSC::CodeLocationDataLabel32::CodeLocationDataLabel32): (JSC::CodeLocationDataLabelPtr::CodeLocationDataLabelPtr): (JSC::CodeLocationCommon::instructionAtOffset): (JSC::CodeLocationCommon::labelAtOffset): (JSC::CodeLocationCommon::jumpAtOffset): (JSC::CodeLocationCommon::callAtOffset): (JSC::CodeLocationCommon::nearCallAtOffset): (JSC::CodeLocationCommon::dataLabelPtrAtOffset): (JSC::CodeLocationCommon::dataLabel32AtOffset):
• assembler/MacroAssemblerCodeRef.h: (JSC::MacroAssemblerCodePtr::operator!):
• bytecode/CodeBlock.h: (JSC::getStructureStubInfoReturnLocation): (JSC::getCallLinkInfoReturnLocation): (JSC::getMethodCallLinkInfoReturnLocation):
• bytecode/Instruction.h:
• bytecode/JumpTable.h: (JSC::StringJumpTable::ctiForValue): (JSC::SimpleJumpTable::ctiForValue):
• bytecode/StructureStubInfo.h:
• bytecompiler/BytecodeGenerator.cpp: (JSC::BytecodeGenerator::emitCatch):
• jit/JIT.cpp: (JSC::JIT::privateCompile):
• jit/JITStubs.cpp: (JSC::JITStubs::DEFINE_STUB_FUNCTION): (JSC::JITStubs::getPolymorphicAccessStructureListSlot):

Location:

trunk/JavaScriptCore/bytecode

Files:

• CodeBlock.h (modified) (4 diffs)
• Instruction.h (modified) (1 diff)
• JumpTable.h (modified) (5 diffs)
• StructureStubInfo.h (modified) (1 diff)

trunk/JavaScriptCore/bytecode/CodeBlock.h

@@ -60 +60 @@
         uint32_t scopeDepth;
 #if ENABLE(JIT)
-        MacroAssembler::CodeLocationLabel nativeCode;
+        CodeLocationLabel nativeCode;
 #endif
     };
@@ -96 +96 @@
     
         unsigned bytecodeIndex;
-        MacroAssembler::CodeLocationNearCall callReturnLocation;
-        MacroAssembler::CodeLocationDataLabelPtr hotPathBegin;
-        MacroAssembler::CodeLocationNearCall hotPathOther;
+        CodeLocationNearCall callReturnLocation;
+        CodeLocationDataLabelPtr hotPathBegin;
+        CodeLocationNearCall hotPathOther;
         CodeBlock* callee;
         unsigned position;
@@ -112 +112 @@
         }
 
-        MacroAssembler::CodeLocationCall callReturnLocation;
-        MacroAssembler::CodeLocationDataLabelPtr structureLabel;
+        CodeLocationCall callReturnLocation;
+        CodeLocationDataLabelPtr structureLabel;
         Structure* cachedStructure;
     };
@@ -160 +160 @@
     inline void* getStructureStubInfoReturnLocation(StructureStubInfo* structureStubInfo)
     {
-        return structureStubInfo->callReturnLocation.calleeReturnAddressValue();
+        return structureStubInfo->callReturnLocation.executableAddress();
     }
 
     inline void* getCallLinkInfoReturnLocation(CallLinkInfo* callLinkInfo)
     {
-        return callLinkInfo->callReturnLocation.calleeReturnAddressValue();
+        return callLinkInfo->callReturnLocation.executableAddress();
     }
 
     inline void* getMethodCallLinkInfoReturnLocation(MethodCallLinkInfo* methodCallLinkInfo)
     {
-        return methodCallLinkInfo->callReturnLocation.calleeReturnAddressValue();
+        return methodCallLinkInfo->callReturnLocation.executableAddress();
     }
 

trunk/JavaScriptCore/bytecode/Instruction.h

@@ -39 +39 @@
 namespace JSC {
 
-    // *Sigh*, If the JIT is enabled we need to track the stubRountine (of type MacroAssembler::CodeLocationLabel),
+    // *Sigh*, If the JIT is enabled we need to track the stubRountine (of type CodeLocationLabel),
     // If the JIT is not in use we don't actually need the variable (that said, if the JIT is not in use we don't
     // curently actually use PolymorphicAccessStructureLists, which we should).  Anyway, this seems like the best
     // solution for now - will need to something smarter if/when we actually want mixed-mode operation.
 #if ENABLE(JIT)
-    typedef MacroAssembler::CodeLocationLabel PolymorphicAccessStructureListStubRoutineType;
+    typedef CodeLocationLabel PolymorphicAccessStructureListStubRoutineType;
 #else
     typedef void* PolymorphicAccessStructureListStubRoutineType;

trunk/JavaScriptCore/bytecode/JumpTable.h

@@ -41 +41 @@
         int32_t branchOffset;
 #if ENABLE(JIT)
-        MacroAssembler::CodeLocationLabel ctiOffset;
+        CodeLocationLabel ctiOffset;
 #endif
     };
@@ -49 +49 @@
         StringOffsetTable offsetTable;
 #if ENABLE(JIT)
-        MacroAssembler::CodeLocationLabel ctiDefault; // FIXME: it should not be necessary to store this.
+        CodeLocationLabel ctiDefault; // FIXME: it should not be necessary to store this.
 #endif
 
@@ -62 +62 @@
 
 #if ENABLE(JIT)
-        inline MacroAssembler::CodeLocationLabel ctiForValue(UString::Rep* value)
+        inline CodeLocationLabel ctiForValue(UString::Rep* value)
         {
             StringOffsetTable::const_iterator end = offsetTable.end();
@@ -78 +78 @@
         int32_t min;
 #if ENABLE(JIT)
-        Vector<MacroAssembler::CodeLocationLabel> ctiOffsets;
-        MacroAssembler::CodeLocationLabel ctiDefault;
+        Vector<CodeLocationLabel> ctiOffsets;
+        CodeLocationLabel ctiDefault;
 #endif
 
@@ -90 +90 @@
 
 #if ENABLE(JIT)
-        inline MacroAssembler::CodeLocationLabel ctiForValue(int32_t value)
+        inline CodeLocationLabel ctiForValue(int32_t value)
         {
             if (value >= min && static_cast<uint32_t>(value - min) < ctiOffsets.size())

trunk/JavaScriptCore/bytecode/StructureStubInfo.h

@@ -145 +145 @@
         } u;
 
-        MacroAssembler::CodeLocationLabel stubRoutine;
-        MacroAssembler::CodeLocationCall callReturnLocation;
-        MacroAssembler::CodeLocationLabel hotPathBegin;
+        CodeLocationLabel stubRoutine;
+        CodeLocationCall callReturnLocation;
+        CodeLocationLabel hotPathBegin;
     };