Changeset 64943 in webkit for trunk/JavaScriptCore/assembler

Timestamp:

Aug 8, 2010, 12:22:06 AM (15 years ago)

Author:

[email protected]

Message:

2010-08-07 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r64938.
​http://trac.webkit.org/changeset/64938
​https://bugs.webkit.org/show_bug.cgi?id=43685

Did not compile on several ports (Requested by abarth on
#webkit).

• Android.mk:
• CMakeLists.txt:
• GNUmakefile.am:
• JavaScriptCore.gypi:
• JavaScriptCore.pro:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• assembler/AbstractMacroAssembler.h:
• assembler/MacroAssembler.h:
• assembler/MacroAssemblerX86.h: (JSC::MacroAssemblerX86::load32): (JSC::MacroAssemblerX86::store32):
• assembler/X86Assembler.h: (JSC::X86Assembler::movl_rm): (JSC::X86Assembler::movl_mr):
• bytecode/CodeBlock.cpp: (JSC::CodeBlock::markAggregate):
• bytecode/Instruction.h: (JSC::PolymorphicAccessStructureList::PolymorphicStubInfo::): (JSC::PolymorphicAccessStructureList::PolymorphicStubInfo::set): (JSC::PolymorphicAccessStructureList::PolymorphicAccessStructureList):
• bytecode/StructureStubInfo.cpp: (JSC::StructureStubInfo::deref):
• bytecode/StructureStubInfo.h: (JSC::StructureStubInfo::initGetByIdProto): (JSC::StructureStubInfo::initGetByIdChain): (JSC::StructureStubInfo::):
• jit/JIT.h:
• jit/JITMarkObjects.cpp: Removed.
• jit/JITPropertyAccess.cpp: (JSC::JIT::compileGetDirectOffset): (JSC::JIT::testPrototype): (JSC::JIT::privateCompilePutByIdTransition): (JSC::JIT::privateCompileGetByIdProto): (JSC::JIT::privateCompileGetByIdProtoList): (JSC::JIT::privateCompileGetByIdChainList): (JSC::JIT::privateCompileGetByIdChain):
• jit/JITPropertyAccess32_64.cpp: (JSC::JIT::compileGetDirectOffset): (JSC::JIT::testPrototype): (JSC::JIT::privateCompilePutByIdTransition): (JSC::JIT::privateCompileGetByIdProto): (JSC::JIT::privateCompileGetByIdProtoList): (JSC::JIT::privateCompileGetByIdChainList): (JSC::JIT::privateCompileGetByIdChain):
• jit/JITStubs.cpp: (JSC::setupPolymorphicProtoList):
• wtf/Platform.h:

Location:

trunk/JavaScriptCore/assembler

Files:

• AbstractMacroAssembler.h (modified) (1 diff)
• MacroAssembler.h (modified) (1 diff)
• MacroAssemblerX86.h (modified) (2 diffs)
• X86Assembler.h (modified) (2 diffs)

trunk/JavaScriptCore/assembler/AbstractMacroAssembler.h

@@ -522 +522 @@
     }
 
-    static int32_t int32AtLocation(CodeLocationDataLabel32 dataLabel32)
-    {
-        return AssemblerType::int32AtLocation(dataLabel32.dataLocation());
-    }
-
-    static void* pointerAtLocation(CodeLocationDataLabelPtr dataLabelPtr)
-    {
-        return AssemblerType::pointerAtLocation(dataLabelPtr.dataLocation());
-    }
-
-    static void* jumpTarget(CodeLocationJump jump)
-    {
-        return AssemblerType::jumpTarget(jump.dataLocation());
-    }
-
     static void repatchInt32(CodeLocationDataLabel32 dataLabel32, int32_t value)
     {

trunk/JavaScriptCore/assembler/MacroAssembler.h

@@ -210 +210 @@
     }
 
-    void loadPtrWithPatch(void* address, RegisterID dest)
-    {
-        load32WithPatch(address, dest);
-    }
 
     void loadPtr(ImplicitAddress address, RegisterID dest)

trunk/JavaScriptCore/assembler/MacroAssemblerX86.h

@@ -83 +83 @@
     }
 
-    void load32WithPatch(void* address, RegisterID dest)
+    void load32(void* address, RegisterID dest)
     {
         m_assembler.movl_mr(address, dest);
-    }
-
-    void load32(void* address, RegisterID dest)
-    {
-        if (dest == X86Registers::eax)
-            m_assembler.movl_mEAX(address);
-        else
-            m_assembler.movl_mr(address, dest);
     }
 
@@ -114 +106 @@
     void store32(RegisterID src, void* address)
     {
-        if (src == X86Registers::eax)
-            m_assembler.movl_EAXm(address);
-        else
-            m_assembler.movl_rm(src, address);
+        m_assembler.movl_rm(src, address);
     }
 

trunk/JavaScriptCore/assembler/X86Assembler.h

@@ -1155 +1155 @@
     void movl_rm(RegisterID src, void* addr)
     {
-        m_formatter.oneByteOp(OP_MOV_EvGv, src, addr);
+        if (src == X86Registers::eax)
+            movl_EAXm(addr);
+        else 
+            m_formatter.oneByteOp(OP_MOV_EvGv, src, addr);
     }
     
     void movl_mr(void* addr, RegisterID dst)
     {
-        m_formatter.oneByteOp(OP_MOV_GvEv, dst, addr);
+        if (dst == X86Registers::eax)
+            movl_mEAX(addr);
+        else
+            m_formatter.oneByteOp(OP_MOV_GvEv, dst, addr);
     }
 
@@ -1552 +1558 @@
 
         setPointer(reinterpret_cast<char*>(code) + where.m_offset, value);
-    }
-
-    static int32_t int32AtLocation(void* where)
-    {
-        return static_cast<int32_t*>(where)[-1];
-    }
-
-    static void* pointerAtLocation(void* where)
-    {
-        return static_cast<void**>(where)[-1];
-    }
-
-    static void* jumpTarget(void* jump)
-    {
-        intptr_t src = reinterpret_cast<intptr_t>(jump);
-        int32_t offset = static_cast<int32_t*>(jump)[-1];
-        return reinterpret_cast<void*>(src + offset);
     }