Changeset 36311 in webkit for trunk/JavaScriptCore/masm

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/masm

Files:

• MacroAssembler.h (deleted)
• MacroAssemblerWin.cpp (deleted)
• X86Assembler.h (modified) (1 diff)

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)