Changeset 36311 in webkit for trunk/JavaScriptCore

Timestamp:

Sep 9, 2008, 8:22:04 PM (17 years ago)

Author:

[email protected]

Message:

2008-09-09 Cameron Zwarich <​[email protected]>

Reviewed by Maciej Stachowiak.

Bug 20759: Remove MacroAssembler
<​https://bugs.webkit.org/show_bug.cgi?id=20759>

Remove MacroAssembler and move its functionality to X86Assembler.

JavaScriptCore:

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• VM/CTI.cpp: (JSC::CTI::emitGetArg): (JSC::CTI::emitGetPutArg): (JSC::CTI::emitPutArg): (JSC::CTI::emitPutCTIParam): (JSC::CTI::emitGetCTIParam): (JSC::CTI::emitPutToCallFrameHeader): (JSC::CTI::emitGetFromCallFrameHeader): (JSC::CTI::emitPutResult): (JSC::CTI::emitDebugExceptionCheck): (JSC::CTI::emitJumpSlowCaseIfNotImm): (JSC::CTI::emitJumpSlowCaseIfNotImms): (JSC::CTI::emitFastArithDeTagImmediate): (JSC::CTI::emitFastArithReTagImmediate): (JSC::CTI::emitFastArithPotentiallyReTagImmediate): (JSC::CTI::emitFastArithImmToInt): (JSC::CTI::emitFastArithIntToImmOrSlowCase): (JSC::CTI::emitFastArithIntToImmNoCheck): (JSC::CTI::compileOpCall): (JSC::CTI::emitSlowScriptCheck): (JSC::CTI::privateCompileMainPass): (JSC::CTI::privateCompileSlowCases): (JSC::CTI::privateCompile): (JSC::CTI::privateCompileGetByIdSelf): (JSC::CTI::privateCompileGetByIdProto): (JSC::CTI::privateCompileGetByIdChain): (JSC::CTI::privateCompilePutByIdReplace): (JSC::CTI::privateArrayLengthTrampoline): (JSC::CTI::privateStringLengthTrampoline): (JSC::CTI::compileRegExp):
• VM/CTI.h: (JSC::CallRecord::CallRecord): (JSC::JmpTable::JmpTable): (JSC::SlowCaseEntry::SlowCaseEntry): (JSC::CTI::JSRInfo::JSRInfo):
• masm/MacroAssembler.h: Removed.
• masm/MacroAssemblerWin.cpp: Removed.
• masm/X86Assembler.h: (JSC::X86Assembler::emitConvertToFastCall): (JSC::X86Assembler::emitRestoreArgumentReference):
• wrec/WREC.h: (JSC::WRECGenerator::WRECGenerator): (JSC::WRECParser::WRECParser):

WebCore:

• ForwardingHeaders/masm/IA32MacroAsm.h: Removed.
• ForwardingHeaders/masm/MacroAssembler.h: Removed.
• ForwardingHeaders/masm/X86Assembler.h: Added.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• VM/CTI.cpp (modified) (46 diffs)
• VM/CTI.h (modified) (8 diffs)
• masm/MacroAssembler.h (deleted)
• masm/MacroAssemblerWin.cpp (deleted)
• masm/X86Assembler.h (modified) (1 diff)
• wrec/WREC.h (modified) (5 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-09-09  Cameron Zwarich  <[email protected]>
+
+        Reviewed by Maciej Stachowiak.
+
+        Bug 20759: Remove MacroAssembler
+        <https://bugs.webkit.org/show_bug.cgi?id=20759>
+
+        Remove MacroAssembler and move its functionality to X86Assembler.
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * VM/CTI.cpp:
+        (JSC::CTI::emitGetArg):
+        (JSC::CTI::emitGetPutArg):
+        (JSC::CTI::emitPutArg):
+        (JSC::CTI::emitPutCTIParam):
+        (JSC::CTI::emitGetCTIParam):
+        (JSC::CTI::emitPutToCallFrameHeader):
+        (JSC::CTI::emitGetFromCallFrameHeader):
+        (JSC::CTI::emitPutResult):
+        (JSC::CTI::emitDebugExceptionCheck):
+        (JSC::CTI::emitJumpSlowCaseIfNotImm):
+        (JSC::CTI::emitJumpSlowCaseIfNotImms):
+        (JSC::CTI::emitFastArithDeTagImmediate):
+        (JSC::CTI::emitFastArithReTagImmediate):
+        (JSC::CTI::emitFastArithPotentiallyReTagImmediate):
+        (JSC::CTI::emitFastArithImmToInt):
+        (JSC::CTI::emitFastArithIntToImmOrSlowCase):
+        (JSC::CTI::emitFastArithIntToImmNoCheck):
+        (JSC::CTI::compileOpCall):
+        (JSC::CTI::emitSlowScriptCheck):
+        (JSC::CTI::privateCompileMainPass):
+        (JSC::CTI::privateCompileSlowCases):
+        (JSC::CTI::privateCompile):
+        (JSC::CTI::privateCompileGetByIdSelf):
+        (JSC::CTI::privateCompileGetByIdProto):
+        (JSC::CTI::privateCompileGetByIdChain):
+        (JSC::CTI::privateCompilePutByIdReplace):
+        (JSC::CTI::privateArrayLengthTrampoline):
+        (JSC::CTI::privateStringLengthTrampoline):
+        (JSC::CTI::compileRegExp):
+        * VM/CTI.h:
+        (JSC::CallRecord::CallRecord):
+        (JSC::JmpTable::JmpTable):
+        (JSC::SlowCaseEntry::SlowCaseEntry):
+        (JSC::CTI::JSRInfo::JSRInfo):
+        * masm/MacroAssembler.h: Removed.
+        * masm/MacroAssemblerWin.cpp: Removed.
+        * masm/X86Assembler.h:
+        (JSC::X86Assembler::emitConvertToFastCall):
+        (JSC::X86Assembler::emitRestoreArgumentReference):
+        * wrec/WREC.h:
+        (JSC::WRECGenerator::WRECGenerator):
+        (JSC::WRECParser::WRECParser):
+
 2008-09-09  Sam Weinig  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj

@@ -1350 +1350 @@
                                 >
                         </File>
-                        <File
-                                RelativePath="..\..\masm\MacroAssembler.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\masm\MacroAssemblerWin.cpp"
-                                >
-                        </File>
                 </Filter>
                 <Filter

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -115 +115 @@
                 A72701B90DADE94900E548D7 /* ExceptionHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = A72701B30DADE94900E548D7 /* ExceptionHelpers.h */; };
                 A727FF6B0DA3092200E548D7 /* JSPropertyNameIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A727FF660DA3053B00E548D7 /* JSPropertyNameIterator.cpp */; };
-                A763F79D0E70E0FE00BC151E /* MacroAssembler.h in Headers */ = {isa = PBXBuildFile; fileRef = A763F79C0E70E0FE00BC151E /* MacroAssembler.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 A7C31DAA0DBEBA4300FDF8EB /* SegmentedVector.h in Headers */ = {isa = PBXBuildFile; fileRef = A7C31DA80DBEBA4300FDF8EB /* SegmentedVector.h */; };
                 BC02E90D0E1839DB000F9297 /* ErrorConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC02E9050E1839DB000F9297 /* ErrorConstructor.h */; };
@@ -640 +639 @@
                 A727FF650DA3053B00E548D7 /* JSPropertyNameIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSPropertyNameIterator.h; path = VM/JSPropertyNameIterator.h; sourceTree = "<group>"; };
                 A727FF660DA3053B00E548D7 /* JSPropertyNameIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSPropertyNameIterator.cpp; path = VM/JSPropertyNameIterator.cpp; sourceTree = "<group>"; };
-                A763F79C0E70E0FE00BC151E /* MacroAssembler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacroAssembler.h; sourceTree = "<group>"; };
                 A7C31DA80DBEBA4300FDF8EB /* SegmentedVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SegmentedVector.h; path = VM/SegmentedVector.h; sourceTree = "<group>"; };
                 A7E42C180E3938830065A544 /* JSStaticScopeObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStaticScopeObject.h; sourceTree = "<group>"; };
@@ -1317 +1315 @@
                         isa = PBXGroup;
                         children = (
-                                A763F79C0E70E0FE00BC151E /* MacroAssembler.h */,
                                 869081400E640C89000D36ED /* X86Assembler.h */,
                         );
@@ -1589 +1586 @@
                                 933040040E6A749400786E6A /* SmallStrings.h in Headers */,
                                 BCDE3AB80E6C82F5001453A7 /* StructureID.h in Headers */,
-                                A763F79D0E70E0FE00BC151E /* MacroAssembler.h in Headers */,
                                 147B83AC0E6DB8C9004775A4 /* BatchedTransitionOptimizer.h in Headers */,
                                 147B84630E6DE6B1004775A4 /* PutPropertySlot.h in Headers */,

trunk/JavaScriptCore/VM/CTI.cpp

@@ -108 +108 @@
 
 // get arg puts an arg from the SF register array into a h/w register
-ALWAYS_INLINE void CTI::emitGetArg(unsigned src, MacroAssembler::RegisterID dst)
+ALWAYS_INLINE void CTI::emitGetArg(unsigned src, X86Assembler::RegisterID dst)
 {
     // TODO: we want to reuse values that are already in registers if we can - add a register allocator!
@@ -119 +119 @@
 
 // get arg puts an arg from the SF register array onto the stack, as an arg to a context threaded function.
-ALWAYS_INLINE void CTI::emitGetPutArg(unsigned src, unsigned offset, MacroAssembler::RegisterID scratch)
+ALWAYS_INLINE void CTI::emitGetPutArg(unsigned src, unsigned offset, X86Assembler::RegisterID scratch)
 {
     if (src < m_codeBlock->constantRegisters.size()) {
@@ -131 +131 @@
 
 // puts an arg onto the stack, as an arg to a context threaded function.
-ALWAYS_INLINE void CTI::emitPutArg(MacroAssembler::RegisterID src, unsigned offset)
+ALWAYS_INLINE void CTI::emitPutArg(X86Assembler::RegisterID src, unsigned offset)
 {
     m_jit.movl_rm(src, offset + sizeof(void*), X86::esp);
@@ -150 +150 @@
 }
 
-ALWAYS_INLINE void CTI::emitPutCTIParam(MacroAssembler::RegisterID from, unsigned name)
+ALWAYS_INLINE void CTI::emitPutCTIParam(X86Assembler::RegisterID from, unsigned name)
 {
     m_jit.movl_rm(from, name * sizeof(void*), X86::esp);
 }
 
-ALWAYS_INLINE void CTI::emitGetCTIParam(unsigned name, MacroAssembler::RegisterID to)
+ALWAYS_INLINE void CTI::emitGetCTIParam(unsigned name, X86Assembler::RegisterID to)
 {
     m_jit.movl_mr(name * sizeof(void*), X86::esp, to);
 }
 
-ALWAYS_INLINE void CTI::emitPutToCallFrameHeader(MacroAssembler::RegisterID from, RegisterFile::CallFrameHeaderEntry entry)
+ALWAYS_INLINE void CTI::emitPutToCallFrameHeader(X86Assembler::RegisterID from, RegisterFile::CallFrameHeaderEntry entry)
 {
     m_jit.movl_rm(from, -((m_codeBlock->numLocals + RegisterFile::CallFrameHeaderSize) - entry) * sizeof(Register), X86::edi);
 }
 
-ALWAYS_INLINE void CTI::emitGetFromCallFrameHeader(RegisterFile::CallFrameHeaderEntry entry, MacroAssembler::RegisterID to)
+ALWAYS_INLINE void CTI::emitGetFromCallFrameHeader(RegisterFile::CallFrameHeaderEntry entry, X86Assembler::RegisterID to)
 {
     m_jit.movl_mr(-((m_codeBlock->numLocals + RegisterFile::CallFrameHeaderSize) - entry) * sizeof(Register), X86::edi, to);
 }
 
-ALWAYS_INLINE void CTI::emitPutResult(unsigned dst, MacroAssembler::RegisterID from)
+ALWAYS_INLINE void CTI::emitPutResult(unsigned dst, X86Assembler::RegisterID from)
 {
     m_jit.movl_rm(from, dst * sizeof(Register), X86::edi);
@@ -202 +202 @@
     emitGetCTIParam(CTI_ARGS_exec, X86::ecx);
     m_jit.cmpl_i32m(0, OBJECT_OFFSET(ExecState, m_exception), X86::ecx);
-    MacroAssembler::JmpSrc noException = m_jit.emitUnlinkedJe();
+    X86Assembler::JmpSrc noException = m_jit.emitUnlinkedJe();
     m_jit.emitInt3();
     m_jit.link(noException, m_jit.label());
@@ -303 +303 @@
 }
 
-ALWAYS_INLINE void CTI::emitJumpSlowCaseIfNotImm(MacroAssembler::RegisterID reg, unsigned opcodeIndex)
+ALWAYS_INLINE void CTI::emitJumpSlowCaseIfNotImm(X86Assembler::RegisterID reg, unsigned opcodeIndex)
 {
     m_jit.testl_i32r(JSImmediate::TagBitTypeInteger, reg);
@@ -309 +309 @@
 }
 
-ALWAYS_INLINE void CTI::emitJumpSlowCaseIfNotImms(MacroAssembler::RegisterID reg1, MacroAssembler::RegisterID reg2, unsigned opcodeIndex)
+ALWAYS_INLINE void CTI::emitJumpSlowCaseIfNotImms(X86Assembler::RegisterID reg1, X86Assembler::RegisterID reg2, unsigned opcodeIndex)
 {
     m_jit.movl_rr(reg1, X86::ecx);
@@ -322 +322 @@
 }
 
-ALWAYS_INLINE void CTI::emitFastArithDeTagImmediate(MacroAssembler::RegisterID reg)
+ALWAYS_INLINE void CTI::emitFastArithDeTagImmediate(X86Assembler::RegisterID reg)
 {
     // op_mod relies on this being a sub - setting zf if result is 0.
@@ -328 +328 @@
 }
 
-ALWAYS_INLINE void CTI::emitFastArithReTagImmediate(MacroAssembler::RegisterID reg)
+ALWAYS_INLINE void CTI::emitFastArithReTagImmediate(X86Assembler::RegisterID reg)
 {
     m_jit.addl_i8r(JSImmediate::TagBitTypeInteger, reg);
 }
 
-ALWAYS_INLINE void CTI::emitFastArithPotentiallyReTagImmediate(MacroAssembler::RegisterID reg)
+ALWAYS_INLINE void CTI::emitFastArithPotentiallyReTagImmediate(X86Assembler::RegisterID reg)
 {
     m_jit.orl_rr(JSImmediate::TagBitTypeInteger, reg);
 }
 
-ALWAYS_INLINE void CTI::emitFastArithImmToInt(MacroAssembler::RegisterID reg)
+ALWAYS_INLINE void CTI::emitFastArithImmToInt(X86Assembler::RegisterID reg)
 {
     m_jit.sarl_i8r(1, reg);
 }
 
-ALWAYS_INLINE void CTI::emitFastArithIntToImmOrSlowCase(MacroAssembler::RegisterID reg, unsigned opcodeIndex)
+ALWAYS_INLINE void CTI::emitFastArithIntToImmOrSlowCase(X86Assembler::RegisterID reg, unsigned opcodeIndex)
 {
     m_jit.addl_rr(reg, reg);
@@ -350 +350 @@
 }
 
-ALWAYS_INLINE void CTI::emitFastArithIntToImmNoCheck(MacroAssembler::RegisterID reg)
+ALWAYS_INLINE void CTI::emitFastArithIntToImmNoCheck(X86Assembler::RegisterID reg)
 {
     m_jit.addl_rr(reg, reg);
@@ -397 +397 @@
     }
 
-    MacroAssembler::JmpSrc wasEval;
+    X86Assembler::JmpSrc wasEval;
     if (type == OpCallEval) {
         emitGetPutArg(instruction[i + 2].u.operand, 0, X86::ecx);
@@ -418 +418 @@
     // Fast check for JS function.
     m_jit.testl_i32r(JSImmediate::TagMask, X86::ecx);
-    MacroAssembler::JmpSrc isNotObject = m_jit.emitUnlinkedJne();
+    X86Assembler::JmpSrc isNotObject = m_jit.emitUnlinkedJne();
     m_jit.cmpl_i32m(reinterpret_cast<unsigned>(m_machine->m_jsFunctionVptr), X86::ecx);
-    MacroAssembler::JmpSrc isJSFunction = m_jit.emitUnlinkedJe();
+    X86Assembler::JmpSrc isJSFunction = m_jit.emitUnlinkedJe();
     m_jit.link(isNotObject, m_jit.label());
 
@@ -427 +427 @@
     emitGetCTIParam(CTI_ARGS_r, X86::edi); // edi := r
     
-    MacroAssembler::JmpSrc wasNotJSFunction = m_jit.emitUnlinkedJmp();
+    X86Assembler::JmpSrc wasNotJSFunction = m_jit.emitUnlinkedJmp();
     m_jit.link(isJSFunction, m_jit.label());
 
@@ -435 +435 @@
     emitGetCTIParam(CTI_ARGS_r, X86::edi); // edi := r
 
-    MacroAssembler::JmpDst end = m_jit.label();
+    X86Assembler::JmpDst end = m_jit.label();
     m_jit.link(wasNotJSFunction, end);
     if (type == OpCallEval)
@@ -446 +446 @@
 {
     m_jit.subl_i8r(1, X86::esi);
-    MacroAssembler::JmpSrc skipTimeout = m_jit.emitUnlinkedJne();
+    X86Assembler::JmpSrc skipTimeout = m_jit.emitUnlinkedJne();
     emitCall(opcodeIndex, Machine::cti_timeout_check);
 
@@ -755 +755 @@
 
             m_jit.cmpl_i32r(reinterpret_cast<uint32_t>(JSImmediate::zeroImmediate()), X86::eax);
-            MacroAssembler::JmpSrc isZero = m_jit.emitUnlinkedJe();
+            X86Assembler::JmpSrc isZero = m_jit.emitUnlinkedJe();
             m_jit.testl_i32r(JSImmediate::TagBitTypeInteger, X86::eax);
             m_jmpTable.append(JmpTable(m_jit.emitUnlinkedJne(), i + 2 + target));
@@ -839 +839 @@
             m_jmpTable.append(JmpTable(m_jit.emitUnlinkedJe(), i + 2 + target));
             m_jit.testl_i32r(JSImmediate::TagBitTypeInteger, X86::eax);
-            MacroAssembler::JmpSrc isNonZero = m_jit.emitUnlinkedJne();
+            X86Assembler::JmpSrc isNonZero = m_jit.emitUnlinkedJne();
 
             m_jit.cmpl_i32r(reinterpret_cast<uint32_t>(JSImmediate::falseImmediate()), X86::eax);
@@ -873 +873 @@
             int target = instruction[i + 2].u.operand;
             m_jit.movl_i32m(0, sizeof(Register) * retAddrDst, X86::edi);
-            MacroAssembler::JmpDst addrPosition = m_jit.label();
+            X86Assembler::JmpDst addrPosition = m_jit.label();
             m_jmpTable.append(JmpTable(m_jit.emitUnlinkedJmp(), i + 2 + target));
-            MacroAssembler::JmpDst sretTarget = m_jit.label();
+            X86Assembler::JmpDst sretTarget = m_jit.label();
             m_jsrSites.append(JSRInfo(addrPosition, sretTarget));
             i += 3;
@@ -982 +982 @@
 
             m_jit.cmpl_i32r(reinterpret_cast<uint32_t>(JSImmediate::zeroImmediate()), X86::eax);
-            MacroAssembler::JmpSrc isZero = m_jit.emitUnlinkedJe();
+            X86Assembler::JmpSrc isZero = m_jit.emitUnlinkedJe();
             m_jit.testl_i32r(JSImmediate::TagBitTypeInteger, X86::eax);
             m_jmpTable.append(JmpTable(m_jit.emitUnlinkedJne(), i + 2 + target));
@@ -1064 +1064 @@
             emitCall(i, Machine::cti_op_next_pname);
             m_jit.testl_rr(X86::eax, X86::eax);
-            MacroAssembler::JmpSrc endOfIter = m_jit.emitUnlinkedJe();
+            X86Assembler::JmpSrc endOfIter = m_jit.emitUnlinkedJe();
             emitPutResult(instruction[i + 1].u.operand);
             m_jmpTable.append(JmpTable(m_jit.emitUnlinkedJmp(), i + 3 + target));
@@ -1284 +1284 @@
                 JSValue* value = m_codeBlock->constantRegisters[src2].jsValue(m_exec);
                 if (JSImmediate::isNumber(value)) {
-                    MacroAssembler::JmpSrc notImm = iter->from;
+                    X86Assembler::JmpSrc notImm = iter->from;
                     m_jit.link((++iter)->from, m_jit.label());
                     m_jit.subl_i32r(getDeTaggedConstantImmediate(value), X86::eax);
@@ -1299 +1299 @@
             ASSERT(!(static_cast<unsigned>(instruction[i + 2].u.operand) < m_codeBlock->constantRegisters.size()));
 
-            MacroAssembler::JmpSrc notImm = iter->from;
+            X86Assembler::JmpSrc notImm = iter->from;
             m_jit.link((++iter)->from, m_jit.label());
             m_jit.subl_rr(X86::edx, X86::eax);
@@ -1312 +1312 @@
         }
         case op_get_by_val: {
-            MacroAssembler::JmpSrc notImm = iter->from;
+            X86Assembler::JmpSrc notImm = iter->from;
             m_jit.link((++iter)->from, m_jit.label());
             m_jit.link((++iter)->from, m_jit.label());
@@ -1326 +1326 @@
         }
         case op_sub: {
-            MacroAssembler::JmpSrc notImm = iter->from;
+            X86Assembler::JmpSrc notImm = iter->from;
             m_jit.link((++iter)->from, m_jit.label());
             m_jit.addl_rr(X86::edx, X86::eax);
@@ -1348 +1348 @@
         }
         case op_lshift: {
-            MacroAssembler::JmpSrc notImm1 = iter->from;
-            MacroAssembler::JmpSrc notImm2 = (++iter)->from;
+            X86Assembler::JmpSrc notImm1 = iter->from;
+            X86Assembler::JmpSrc notImm2 = (++iter)->from;
             m_jit.link((++iter)->from, m_jit.label());
             emitGetArg(instruction[i + 2].u.operand, X86::eax);
@@ -1388 +1388 @@
         case op_pre_inc: {
             unsigned srcDst = instruction[i + 1].u.operand;
-            MacroAssembler::JmpSrc notImm = iter->from;
+            X86Assembler::JmpSrc notImm = iter->from;
             m_jit.link((++iter)->from, m_jit.label());
             m_jit.subl_i8r(getDeTaggedConstantImmediate(JSImmediate::oneImmediate()), X86::eax);
@@ -1399 +1399 @@
         }
         case op_put_by_val: {
-            MacroAssembler::JmpSrc notImm = iter->from;
+            X86Assembler::JmpSrc notImm = iter->from;
             m_jit.link((++iter)->from, m_jit.label());
             m_jit.link((++iter)->from, m_jit.label());
@@ -1426 +1426 @@
         case op_pre_dec: {
             unsigned srcDst = instruction[i + 1].u.operand;
-            MacroAssembler::JmpSrc notImm = iter->from;
+            X86Assembler::JmpSrc notImm = iter->from;
             m_jit.link((++iter)->from, m_jit.label());
             m_jit.addl_i8r(getDeTaggedConstantImmediate(JSImmediate::oneImmediate()), X86::eax);
@@ -1564 +1564 @@
         }
         case op_mod: {
-            MacroAssembler::JmpSrc notImm1 = iter->from;
-            MacroAssembler::JmpSrc notImm2 = (++iter)->from;
+            X86Assembler::JmpSrc notImm1 = iter->from;
+            X86Assembler::JmpSrc notImm2 = (++iter)->from;
             m_jit.link((++iter)->from, m_jit.label());
             emitFastArithReTagImmediate(X86::eax);
@@ -1638 +1638 @@
     // m_codeBlock->ctiReturnAddressVPCMap.grow(m_calls.size());
     for (Vector<CallRecord>::iterator iter = m_calls.begin(); iter != m_calls.end(); ++iter) {
-        MacroAssembler::link(code, iter->from, iter->to);
+        X86Assembler::link(code, iter->from, iter->to);
         m_codeBlock->ctiReturnAddressVPCMap.add(m_jit.getRelocatedAddress(code, iter->from), iter->opcodeIndex);
     }
@@ -1644 +1644 @@
     // Link absolute addresses for jsr
     for (Vector<JSRInfo>::iterator iter = m_jsrSites.begin(); iter != m_jsrSites.end(); ++iter)
-        MacroAssembler::linkAbsoluteAddress(code, iter->addrPosition, iter->target);
+        X86Assembler::linkAbsoluteAddress(code, iter->addrPosition, iter->target);
 
     m_codeBlock->ctiCode = code;
@@ -1653 +1653 @@
     // Check eax is an object of the right StructureID.
     m_jit.testl_i32r(JSImmediate::TagMask, X86::eax);
-    MacroAssembler::JmpSrc failureCases1 = m_jit.emitUnlinkedJne();
+    X86Assembler::JmpSrc failureCases1 = m_jit.emitUnlinkedJne();
     m_jit.cmpl_i32m(reinterpret_cast<uint32_t>(structureID), OBJECT_OFFSET(JSCell, m_structureID), X86::eax);
-    MacroAssembler::JmpSrc failureCases2 = m_jit.emitUnlinkedJne();
+    X86Assembler::JmpSrc failureCases2 = m_jit.emitUnlinkedJne();
 
     // Checks out okay! - getDirectOffset
@@ -1665 +1665 @@
     ASSERT(code);
 
-    MacroAssembler::link(code, failureCases1, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
-    MacroAssembler::link(code, failureCases2, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
+    X86Assembler::link(code, failureCases1, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
+    X86Assembler::link(code, failureCases2, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
     
     m_codeBlock->structureIDAccessStubs.append(code);
@@ -1683 +1683 @@
     // check eax is an object of the right StructureID.
     m_jit.testl_i32r(JSImmediate::TagMask, X86::eax);
-    MacroAssembler::JmpSrc failureCases1 = m_jit.emitUnlinkedJne();
+    X86Assembler::JmpSrc failureCases1 = m_jit.emitUnlinkedJne();
     m_jit.cmpl_i32m(reinterpret_cast<uint32_t>(structureID), OBJECT_OFFSET(JSCell, m_structureID), X86::eax);
-    MacroAssembler::JmpSrc failureCases2 = m_jit.emitUnlinkedJne();
+    X86Assembler::JmpSrc failureCases2 = m_jit.emitUnlinkedJne();
 
     // Check the prototype object's StructureID had not changed.
     StructureID** protoStructureIDAddress = &(protoObject->m_structureID);
     m_jit.cmpl_i32m(reinterpret_cast<uint32_t>(prototypeStructureID), static_cast<void*>(protoStructureIDAddress));
-    MacroAssembler::JmpSrc failureCases3 = m_jit.emitUnlinkedJne();
+    X86Assembler::JmpSrc failureCases3 = m_jit.emitUnlinkedJne();
 
     // Checks out okay! - getDirectOffset
@@ -1700 +1700 @@
     ASSERT(code);
 
-    MacroAssembler::link(code, failureCases1, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
-    MacroAssembler::link(code, failureCases2, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
-    MacroAssembler::link(code, failureCases3, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
+    X86Assembler::link(code, failureCases1, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
+    X86Assembler::link(code, failureCases2, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
+    X86Assembler::link(code, failureCases3, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
 
     m_codeBlock->structureIDAccessStubs.append(code);
@@ -1713 +1713 @@
     ASSERT(count);
     
-    Vector<MacroAssembler::JmpSrc> bucketsOfFail;
+    Vector<X86Assembler::JmpSrc> bucketsOfFail;
 
     // Check eax is an object of the right StructureID.
@@ -1746 +1746 @@
 
     for (unsigned i = 0; i < bucketsOfFail.size(); ++i)
-        MacroAssembler::link(code, bucketsOfFail[i], reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
+        X86Assembler::link(code, bucketsOfFail[i], reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
     m_codeBlock->structureIDAccessStubs.append(code);
     return code;
@@ -1755 +1755 @@
     // check eax is an object of the right StructureID.
     m_jit.testl_i32r(JSImmediate::TagMask, X86::eax);
-    MacroAssembler::JmpSrc failureCases1 = m_jit.emitUnlinkedJne();
+    X86Assembler::JmpSrc failureCases1 = m_jit.emitUnlinkedJne();
     m_jit.cmpl_i32m(reinterpret_cast<uint32_t>(structureID), OBJECT_OFFSET(JSCell, m_structureID), X86::eax);
-    MacroAssembler::JmpSrc failureCases2 = m_jit.emitUnlinkedJne();
+    X86Assembler::JmpSrc failureCases2 = m_jit.emitUnlinkedJne();
 
     // checks out okay! - putDirectOffset
@@ -1767 +1767 @@
     ASSERT(code);
     
-    MacroAssembler::link(code, failureCases1, reinterpret_cast<void*>(Machine::cti_op_put_by_id_fail));
-    MacroAssembler::link(code, failureCases2, reinterpret_cast<void*>(Machine::cti_op_put_by_id_fail));
+    X86Assembler::link(code, failureCases1, reinterpret_cast<void*>(Machine::cti_op_put_by_id_fail));
+    X86Assembler::link(code, failureCases2, reinterpret_cast<void*>(Machine::cti_op_put_by_id_fail));
 
     m_codeBlock->structureIDAccessStubs.append(code);
@@ -1779 +1779 @@
     // Check eax is an array
     m_jit.testl_i32r(JSImmediate::TagMask, X86::eax);
-    MacroAssembler::JmpSrc failureCases1 = m_jit.emitUnlinkedJne();
+    X86Assembler::JmpSrc failureCases1 = m_jit.emitUnlinkedJne();
     m_jit.cmpl_i32m(reinterpret_cast<unsigned>(m_machine->m_jsArrayVptr), X86::eax);
-    MacroAssembler::JmpSrc failureCases2 = m_jit.emitUnlinkedJne();
+    X86Assembler::JmpSrc failureCases2 = m_jit.emitUnlinkedJne();
 
     // Checks out okay! - get the length from the storage
@@ -1788 +1788 @@
 
     m_jit.addl_rr(X86::eax, X86::eax);
-    MacroAssembler::JmpSrc failureCases3 = m_jit.emitUnlinkedJo();
+    X86Assembler::JmpSrc failureCases3 = m_jit.emitUnlinkedJo();
     m_jit.addl_i8r(1, X86::eax);
     
@@ -1796 +1796 @@
     ASSERT(code);
 
-    MacroAssembler::link(code, failureCases1, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
-    MacroAssembler::link(code, failureCases2, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
-    MacroAssembler::link(code, failureCases3, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
+    X86Assembler::link(code, failureCases1, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
+    X86Assembler::link(code, failureCases2, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
+    X86Assembler::link(code, failureCases3, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
     
     return code;
@@ -1807 +1807 @@
     // Check eax is a string
     m_jit.testl_i32r(JSImmediate::TagMask, X86::eax);
-    MacroAssembler::JmpSrc failureCases1 = m_jit.emitUnlinkedJne();
+    X86Assembler::JmpSrc failureCases1 = m_jit.emitUnlinkedJne();
     m_jit.cmpl_i32m(reinterpret_cast<unsigned>(m_machine->m_jsStringVptr), X86::eax);
-    MacroAssembler::JmpSrc failureCases2 = m_jit.emitUnlinkedJne();
+    X86Assembler::JmpSrc failureCases2 = m_jit.emitUnlinkedJne();
 
     // Checks out okay! - get the length from the Ustring.
@@ -1816 +1816 @@
 
     m_jit.addl_rr(X86::eax, X86::eax);
-    MacroAssembler::JmpSrc failureCases3 = m_jit.emitUnlinkedJo();
+    X86Assembler::JmpSrc failureCases3 = m_jit.emitUnlinkedJo();
     m_jit.addl_i8r(1, X86::eax);
     
@@ -1824 +1824 @@
     ASSERT(code);
 
-    MacroAssembler::link(code, failureCases1, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
-    MacroAssembler::link(code, failureCases2, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
-    MacroAssembler::link(code, failureCases3, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
+    X86Assembler::link(code, failureCases1, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
+    X86Assembler::link(code, failureCases2, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
+    X86Assembler::link(code, failureCases3, reinterpret_cast<void*>(Machine::cti_op_get_by_id_fail));
 
     return code;
@@ -1841 +1841 @@
     }
 
-    MacroAssembler jit(exec->machine()->jitCodeBuffer());
+    X86Assembler jit(exec->machine()->jitCodeBuffer());
     WRECParser parser(pattern, ignoreCase, multiline, jit);
     

trunk/JavaScriptCore/VM/CTI.h

@@ -33 +33 @@
 #include "RegisterFile.h"
 #include "RegisterFile.h"
-#include <masm/MacroAssembler.h>
+#include <masm/X86Assembler.h>
 #include <profiler/Profiler.h>
 #include <wtf/AlwaysInline.h>
@@ -115 +115 @@
 
     struct CallRecord {
-        MacroAssembler::JmpSrc from;
+        X86Assembler::JmpSrc from;
         void* to;
         unsigned opcodeIndex;
@@ -123 +123 @@
         }
 
-        CallRecord(MacroAssembler::JmpSrc f, CTIHelper_j t, unsigned i)
-            : from(f)
-            , to((void*)t)
-            , opcodeIndex(i)
-        {
-        }
-
-        CallRecord(MacroAssembler::JmpSrc f, CTIHelper_p t, unsigned i)
-            : from(f)
-            , to((void*)t)
-            , opcodeIndex(i)
-        {
-        }
-        
-        CallRecord(MacroAssembler::JmpSrc f, CTIHelper_v t, unsigned i)
-            : from(f)
-            , to((void*)t)
-            , opcodeIndex(i)
-        {
-        }
-        
-        CallRecord(MacroAssembler::JmpSrc f, CTIHelper_s t, unsigned i)
-            : from(f)
-            , to((void*)t)
-            , opcodeIndex(i)
-        {
-        }
-        
-        CallRecord(MacroAssembler::JmpSrc f, CTIHelper_b t, unsigned i)
+        CallRecord(X86Assembler::JmpSrc f, CTIHelper_j t, unsigned i)
+            : from(f)
+            , to((void*)t)
+            , opcodeIndex(i)
+        {
+        }
+
+        CallRecord(X86Assembler::JmpSrc f, CTIHelper_p t, unsigned i)
+            : from(f)
+            , to((void*)t)
+            , opcodeIndex(i)
+        {
+        }
+        
+        CallRecord(X86Assembler::JmpSrc f, CTIHelper_v t, unsigned i)
+            : from(f)
+            , to((void*)t)
+            , opcodeIndex(i)
+        {
+        }
+        
+        CallRecord(X86Assembler::JmpSrc f, CTIHelper_s t, unsigned i)
+            : from(f)
+            , to((void*)t)
+            , opcodeIndex(i)
+        {
+        }
+        
+        CallRecord(X86Assembler::JmpSrc f, CTIHelper_b t, unsigned i)
             : from(f)
             , to((void*)t)
@@ -160 +160 @@
 
     struct JmpTable {
-        MacroAssembler::JmpSrc from;
+        X86Assembler::JmpSrc from;
         unsigned to;
         
-        JmpTable(MacroAssembler::JmpSrc f, unsigned t)
+        JmpTable(X86Assembler::JmpSrc f, unsigned t)
             : from(f)
             , to(t)
@@ -171 +171 @@
 
     struct SlowCaseEntry {
-        MacroAssembler::JmpSrc from;
+        X86Assembler::JmpSrc from;
         unsigned to;
         unsigned hint;
         
-        SlowCaseEntry(MacroAssembler::JmpSrc f, unsigned t, unsigned h = 0)
+        SlowCaseEntry(X86Assembler::JmpSrc f, unsigned t, unsigned h = 0)
             : from(f)
             , to(t)
@@ -298 +298 @@
         void compileOpCall(Instruction* instruction, unsigned i, CompileOpCallType type = OpCallNormal);
 
-        void emitGetArg(unsigned src, MacroAssembler::RegisterID dst);
-        void emitGetPutArg(unsigned src, unsigned offset, MacroAssembler::RegisterID scratch);
-        void emitPutArg(MacroAssembler::RegisterID src, unsigned offset);
+        void emitGetArg(unsigned src, X86Assembler::RegisterID dst);
+        void emitGetPutArg(unsigned src, unsigned offset, X86Assembler::RegisterID scratch);
+        void emitPutArg(X86Assembler::RegisterID src, unsigned offset);
         void emitPutArgConstant(unsigned value, unsigned offset);
-        void emitPutResult(unsigned dst, MacroAssembler::RegisterID from = X86::eax);
-
-        void emitPutCTIParam(MacroAssembler::RegisterID from, unsigned name);
-        void emitGetCTIParam(unsigned name, MacroAssembler::RegisterID to);
-
-        void emitPutToCallFrameHeader(MacroAssembler::RegisterID from, RegisterFile::CallFrameHeaderEntry entry);
-        void emitGetFromCallFrameHeader(RegisterFile::CallFrameHeaderEntry entry, MacroAssembler::RegisterID to);
+        void emitPutResult(unsigned dst, X86Assembler::RegisterID from = X86::eax);
+
+        void emitPutCTIParam(X86Assembler::RegisterID from, unsigned name);
+        void emitGetCTIParam(unsigned name, X86Assembler::RegisterID to);
+
+        void emitPutToCallFrameHeader(X86Assembler::RegisterID from, RegisterFile::CallFrameHeaderEntry entry);
+        void emitGetFromCallFrameHeader(RegisterFile::CallFrameHeaderEntry entry, X86Assembler::RegisterID to);
 
         JSValue* getConstantImmediateNumericArg(unsigned src);
         unsigned getDeTaggedConstantImmediate(JSValue* imm);
 
-        void emitJumpSlowCaseIfNotImm(MacroAssembler::RegisterID, unsigned opcodeIndex);
-        void emitJumpSlowCaseIfNotImms(MacroAssembler::RegisterID, MacroAssembler::RegisterID, unsigned opcodeIndex);
-
-        void emitFastArithDeTagImmediate(MacroAssembler::RegisterID);
-        void emitFastArithReTagImmediate(MacroAssembler::RegisterID);
-        void emitFastArithPotentiallyReTagImmediate(MacroAssembler::RegisterID);
-        void emitFastArithImmToInt(MacroAssembler::RegisterID);
-        void emitFastArithIntToImmOrSlowCase(MacroAssembler::RegisterID, unsigned opcodeIndex);
-        void emitFastArithIntToImmNoCheck(MacroAssembler::RegisterID);
+        void emitJumpSlowCaseIfNotImm(X86Assembler::RegisterID, unsigned opcodeIndex);
+        void emitJumpSlowCaseIfNotImms(X86Assembler::RegisterID, X86Assembler::RegisterID, unsigned opcodeIndex);
+
+        void emitFastArithDeTagImmediate(X86Assembler::RegisterID);
+        void emitFastArithReTagImmediate(X86Assembler::RegisterID);
+        void emitFastArithPotentiallyReTagImmediate(X86Assembler::RegisterID);
+        void emitFastArithImmToInt(X86Assembler::RegisterID);
+        void emitFastArithIntToImmOrSlowCase(X86Assembler::RegisterID, unsigned opcodeIndex);
+        void emitFastArithIntToImmNoCheck(X86Assembler::RegisterID);
 
         void emitDebugExceptionCheck();
@@ -336 +336 @@
 #endif
 
-        MacroAssembler m_jit;
+        X86Assembler m_jit;
         Machine* m_machine;
         ExecState* m_exec;
@@ -342 +342 @@
 
         Vector<CallRecord> m_calls;
-        Vector<MacroAssembler::JmpDst> m_labels;
+        Vector<X86Assembler::JmpDst> m_labels;
         Vector<JmpTable> m_jmpTable;
 
         struct JSRInfo {
-            MacroAssembler::JmpDst addrPosition;
-            MacroAssembler::JmpDst target;
-
-            JSRInfo(const MacroAssembler::JmpDst& storeLocation, const MacroAssembler::JmpDst& targetLocation)
+            X86Assembler::JmpDst addrPosition;
+            X86Assembler::JmpDst target;
+
+            JSRInfo(const X86Assembler::JmpDst& storeLocation, const X86Assembler::JmpDst& targetLocation)
                 : addrPosition(storeLocation)
                 , target(targetLocation)

trunk/JavaScriptCore/masm/X86Assembler.h

@@ -779 +779 @@
     }
 
+#if COMPILER(MSVC)
+    void emitConvertToFastCall()
+    {
+        movl_mr(4, X86::esp, X86::eax);
+        movl_mr(8, X86::esp, X86::edx);
+        movl_mr(12, X86::esp, X86::ecx);
+    }
+
+    void emitRestoreArgumentReference()
+    {
+        movl_rm(X86::esp, 0, X86::esp);
+    }
+#else
+    void emitConvertToFastCall() {};
+    void emitRestoreArgumentReference() {};
+#endif
+
 private:
     void emitModRm_rr(RegisterID reg, RegisterID rm)

trunk/JavaScriptCore/wrec/WREC.h

@@ -30 +30 @@
 
 #include "ustring.h"
-#include <masm/MacroAssembler.h>
+#include <masm/X86Assembler.h>
 #include <wtf/ASCIICType.h>
 #include <wtf/Vector.h>
+
+#if COMPILER(GCC)
+#define WREC_CALL __attribute__ ((regparm (3)))
+#else
+#define WREC_CALL
+#endif
 
 namespace JSC {
@@ -73 +79 @@
     class WRECParser;
 
-    typedef Vector<MacroAssembler::JmpSrc> JmpSrcVector;
+    typedef Vector<X86Assembler::JmpSrc> JmpSrcVector;
 
     class WRECGenerator {
     public:
-        WRECGenerator(WRECParser& parser, MacroAssembler& jit)
+        WRECGenerator(WRECParser& parser, X86Assembler& jit)
             : m_parser(parser)
             , m_jit(jit)
@@ -83 +89 @@
         }
 
-        typedef MacroAssembler::JmpSrc JmpSrc;
-        typedef MacroAssembler::JmpDst JmpDst;
+        typedef X86Assembler::JmpSrc JmpSrc;
+        typedef X86Assembler::JmpDst JmpDst;
 
         // these regs setup by the params
@@ -123 +129 @@
     private:
         WRECParser& m_parser;
-        MacroAssembler& m_jit;
+        X86Assembler& m_jit;
     };
 
@@ -142 +148 @@
         } m_err;
 
-        WRECParser(const UString& pattern, bool ignoreCase, bool multiline, MacroAssembler& jit)
+        WRECParser(const UString& pattern, bool ignoreCase, bool multiline, X86Assembler& jit)
             : m_ignoreCase(ignoreCase)
             , m_multiline(multiline)