Changeset 36301 in webkit for trunk/JavaScriptCore/masm/X86Assembler.h

Timestamp:

Sep 9, 2008, 3:35:29 PM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Sam Weinig.

Bug 20754: Remove emit prefix from assembler opcode methods
<​https://bugs.webkit.org/show_bug.cgi?id=20754>

• VM/CTI.cpp: (JSC::CTI::emitGetArg): (JSC::CTI::emitGetPutArg): (JSC::CTI::emitPutArg): (JSC::CTI::emitPutArgConstant): (JSC::CTI::emitPutCTIParam): (JSC::CTI::emitGetCTIParam): (JSC::CTI::emitPutToCallFrameHeader): (JSC::CTI::emitGetFromCallFrameHeader): (JSC::CTI::emitPutResult): (JSC::CTI::emitDebugExceptionCheck): (JSC::CTI::emitCall): (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):
• masm/MacroAssemblerWin.cpp: (JSC::MacroAssembler::emitConvertToFastCall): (JSC::MacroAssembler::emitRestoreArgumentReference):
• masm/X86Assembler.h: (JSC::X86Assembler::pushl_r): (JSC::X86Assembler::pushl_m): (JSC::X86Assembler::popl_r): (JSC::X86Assembler::popl_m): (JSC::X86Assembler::movl_rr): (JSC::X86Assembler::addl_rr): (JSC::X86Assembler::addl_i8r): (JSC::X86Assembler::addl_i32r): (JSC::X86Assembler::addl_mr): (JSC::X86Assembler::andl_rr): (JSC::X86Assembler::andl_i32r): (JSC::X86Assembler::cmpl_i8r): (JSC::X86Assembler::cmpl_rr): (JSC::X86Assembler::cmpl_rm): (JSC::X86Assembler::cmpl_i32r): (JSC::X86Assembler::cmpl_i32m): (JSC::X86Assembler::cmpw_rm): (JSC::X86Assembler::orl_rr): (JSC::X86Assembler::subl_rr): (JSC::X86Assembler::subl_i8r): (JSC::X86Assembler::subl_i32r): (JSC::X86Assembler::subl_mr): (JSC::X86Assembler::testl_i32r): (JSC::X86Assembler::testl_rr): (JSC::X86Assembler::xorl_i8r): (JSC::X86Assembler::xorl_rr): (JSC::X86Assembler::sarl_i8r): (JSC::X86Assembler::sarl_CLr): (JSC::X86Assembler::shl_i8r): (JSC::X86Assembler::shll_CLr): (JSC::X86Assembler::mull_rr): (JSC::X86Assembler::idivl_r): (JSC::X86Assembler::cdq): (JSC::X86Assembler::movl_mr): (JSC::X86Assembler::movzwl_mr): (JSC::X86Assembler::movl_rm): (JSC::X86Assembler::movl_i32r): (JSC::X86Assembler::movl_i32m): (JSC::X86Assembler::leal_mr): (JSC::X86Assembler::ret): (JSC::X86Assembler::jmp_r): (JSC::X86Assembler::jmp_m): (JSC::X86Assembler::call_r):
• wrec/WREC.cpp: (JSC::WRECGenerator::generateBacktrack1): (JSC::WRECGenerator::generateBacktrackBackreference): (JSC::WRECGenerator::generateBackreferenceQuantifier): (JSC::WRECGenerator::generateNonGreedyQuantifier): (JSC::WRECGenerator::generateGreedyQuantifier): (JSC::WRECGenerator::generatePatternCharacter): (JSC::WRECGenerator::generateCharacterClassInvertedRange): (JSC::WRECGenerator::generateCharacterClassInverted): (JSC::WRECGenerator::generateCharacterClass): (JSC::WRECGenerator::generateParentheses): (JSC::WRECGenerator::gererateParenthesesResetTrampoline): (JSC::WRECGenerator::generateAssertionBOL): (JSC::WRECGenerator::generateAssertionEOL): (JSC::WRECGenerator::generateAssertionWordBoundary): (JSC::WRECGenerator::generateBackreference): (JSC::WRECGenerator::gernerateDisjunction):

File:

• trunk/JavaScriptCore/masm/X86Assembler.h (modified) (50 diffs)

trunk/JavaScriptCore/masm/X86Assembler.h

@@ -246 +246 @@
     }
     
-    void emitPushl_r(RegisterID reg)
+    void pushl_r(RegisterID reg)
     {
         m_buffer->putByte(OP_PUSH_EAX + reg);
     }
     
-    void emitPushl_m(int offset, RegisterID base)
+    void pushl_m(int offset, RegisterID base)
     {
         m_buffer->putByte(OP_GROUP5_Ev);
@@ -257 +257 @@
     }
     
-    void emitPopl_r(RegisterID reg)
+    void popl_r(RegisterID reg)
     {
         m_buffer->putByte(OP_POP_EAX + reg);
     }
 
-    void emitPopl_m(int offset, RegisterID base)
+    void popl_m(int offset, RegisterID base)
     {
         m_buffer->putByte(OP_GROUP1A_Ev);
@@ -268 +268 @@
     }
     
-    void emitMovl_rr(RegisterID src, RegisterID dst)
+    void movl_rr(RegisterID src, RegisterID dst)
     {
         m_buffer->putByte(OP_MOV_EvGv);
@@ -274 +274 @@
     }
     
-    void emitAddl_rr(RegisterID src, RegisterID dst)
+    void addl_rr(RegisterID src, RegisterID dst)
     {
         m_buffer->putByte(OP_ADD_EvGv);
@@ -280 +280 @@
     }
 
-    void emitAddl_i8r(int imm, RegisterID dst)
+    void addl_i8r(int imm, RegisterID dst)
     {
         m_buffer->putByte(OP_GROUP1_EvIb);
@@ -287 +287 @@
     }
 
-    void emitAddl_i32r(int imm, RegisterID dst)
+    void addl_i32r(int imm, RegisterID dst)
     {
         m_buffer->putByte(OP_GROUP1_EvIz);
@@ -294 +294 @@
     }
 
-    void emitAddl_mr(int offset, RegisterID base, RegisterID dst)
+    void addl_mr(int offset, RegisterID base, RegisterID dst)
     {
         m_buffer->putByte(OP_ADD_GvEv);
@@ -300 +300 @@
     }
 
-    void emitAndl_rr(RegisterID src, RegisterID dst)
+    void andl_rr(RegisterID src, RegisterID dst)
     {
         m_buffer->putByte(OP_AND_EvGv);
@@ -306 +306 @@
     }
 
-    void emitAndl_i32r(int imm, RegisterID dst)
+    void andl_i32r(int imm, RegisterID dst)
     {
         m_buffer->putByte(OP_GROUP1_EvIz);
@@ -313 +313 @@
     }
 
-    void emitCmpl_i8r(int imm, RegisterID dst)
+    void cmpl_i8r(int imm, RegisterID dst)
     {
         m_buffer->putByte(OP_GROUP1_EvIb);
@@ -320 +320 @@
     }
 
-    void emitCmpl_rr(RegisterID src, RegisterID dst)
+    void cmpl_rr(RegisterID src, RegisterID dst)
     {
         m_buffer->putByte(OP_CMP_EvGv);
@@ -326 +326 @@
     }
 
-    void emitCmpl_rm(RegisterID src, int offset, RegisterID base)
+    void cmpl_rm(RegisterID src, int offset, RegisterID base)
     {
         m_buffer->putByte(OP_CMP_EvGv);
@@ -332 +332 @@
     }
 
-    void emitCmpl_i32r(int imm, RegisterID dst)
+    void cmpl_i32r(int imm, RegisterID dst)
     {
         m_buffer->putByte(OP_GROUP1_EvIz);
@@ -339 +339 @@
     }
 
-    void emitCmpl_i32m(int imm, RegisterID dst)
+    void cmpl_i32m(int imm, RegisterID dst)
     {
         m_buffer->putByte(OP_GROUP1_EvIz);
@@ -346 +346 @@
     }
 
-    void emitCmpl_i32m(int imm, int offset, RegisterID dst)
+    void cmpl_i32m(int imm, int offset, RegisterID dst)
     {
         m_buffer->putByte(OP_GROUP1_EvIz);
@@ -353 +353 @@
     }
 
-    void emitCmpl_i32m(int imm, void* addr)
+    void cmpl_i32m(int imm, void* addr)
     {
         m_buffer->putByte(OP_GROUP1_EvIz);
@@ -360 +360 @@
     }
 
-    void emitCmpw_rm(RegisterID src, RegisterID base, RegisterID index, int scale)
+    void cmpw_rm(RegisterID src, RegisterID base, RegisterID index, int scale)
     {
         m_buffer->putByte(PRE_OPERAND_SIZE);
@@ -367 +367 @@
     }
 
-    void emitOrl_rr(RegisterID src, RegisterID dst)
+    void orl_rr(RegisterID src, RegisterID dst)
     {
         m_buffer->putByte(OP_OR_EvGv);
@@ -373 +373 @@
     }
 
-    void emitOrl_i8r(int imm, RegisterID dst)
+    void orl_rr(int imm, RegisterID dst)
     {
         m_buffer->putByte(OP_GROUP1_EvIb);
@@ -380 +380 @@
     }
 
-    void emitSubl_rr(RegisterID src, RegisterID dst)
+    void subl_rr(RegisterID src, RegisterID dst)
     {
         m_buffer->putByte(OP_SUB_EvGv);
@@ -386 +386 @@
     }
 
-    void emitSubl_i8r(int imm, RegisterID dst)
+    void subl_i8r(int imm, RegisterID dst)
     {
         m_buffer->putByte(OP_GROUP1_EvIb);
@@ -393 +393 @@
     }
 
-    void emitSubl_i32r(int imm, RegisterID dst)
+    void subl_i32r(int imm, RegisterID dst)
     {
         m_buffer->putByte(OP_GROUP1_EvIz);
@@ -400 +400 @@
     }
 
-    void emitSubl_mr(int offset, RegisterID base, RegisterID dst)
+    void subl_mr(int offset, RegisterID base, RegisterID dst)
     {
         m_buffer->putByte(OP_SUB_GvEv);
@@ -406 +406 @@
     }
 
-    void emitTestl_i32r(int imm, RegisterID dst)
+    void testl_i32r(int imm, RegisterID dst)
     {
         m_buffer->ensureSpace(MAX_INSTRUCTION_SIZE);
@@ -414 +414 @@
     }
 
-    void emitTestl_rr(RegisterID src, RegisterID dst)
+    void testl_rr(RegisterID src, RegisterID dst)
     {
         m_buffer->putByte(OP_TEST_EvGv);
@@ -420 +420 @@
     }
     
-    void emitXorl_i8r(int imm, RegisterID dst)
+    void xorl_i8r(int imm, RegisterID dst)
     {
         m_buffer->putByte(OP_GROUP1_EvIb);
@@ -427 +427 @@
     }
 
-    void emitXorl_rr(RegisterID src, RegisterID dst)
+    void xorl_rr(RegisterID src, RegisterID dst)
     {
         m_buffer->putByte(OP_XOR_EvGv);
@@ -433 +433 @@
     }
 
-    void emitSarl_i8r(int imm, RegisterID dst)
+    void sarl_i8r(int imm, RegisterID dst)
     {
         if (imm == 1) {
@@ -445 +445 @@
     }
 
-    void emitSarl_CLr(RegisterID dst)
+    void sarl_CLr(RegisterID dst)
     {
         m_buffer->putByte(OP_GROUP2_EvCL);
@@ -451 +451 @@
     }
 
-    void emitShl_i8r(int imm, RegisterID dst)
+    void shl_i8r(int imm, RegisterID dst)
     {
         if (imm == 1) {
@@ -463 +463 @@
     }
 
-    void emitShll_CLr(RegisterID dst)
+    void shll_CLr(RegisterID dst)
     {
         m_buffer->putByte(OP_GROUP2_EvCL);
@@ -469 +469 @@
     }
 
-    void emitMull_rr(RegisterID src, RegisterID dst)
+    void mull_rr(RegisterID src, RegisterID dst)
     {
         m_buffer->putByte(OP_2BYTE_ESCAPE);
@@ -476 +476 @@
     }
 
-    void emitIdivl_r(RegisterID dst)
+    void idivl_r(RegisterID dst)
     {
         m_buffer->putByte(OP_GROUP3_Ev);
@@ -482 +482 @@
     }
 
-    void emitCdq()
+    void cdq()
     {
         m_buffer->putByte(OP_CDQ);
     }
 
-    void emitMovl_mr(RegisterID base, RegisterID dst)
+    void movl_mr(RegisterID base, RegisterID dst)
     {
         m_buffer->putByte(OP_MOV_GvEv);
@@ -493 +493 @@
     }
 
-    void emitMovl_mr(int offset, RegisterID base, RegisterID dst)
+    void movl_mr(int offset, RegisterID base, RegisterID dst)
     {
         m_buffer->ensureSpace(MAX_INSTRUCTION_SIZE);
@@ -500 +500 @@
     }
 
-    void emitMovl_mr(void* addr, RegisterID dst)
+    void movl_mr(void* addr, RegisterID dst)
     {
         m_buffer->putByte(OP_MOV_GvEv);
@@ -506 +506 @@
     }
 
-    void emitMovl_mr(int offset, RegisterID base, RegisterID index, int scale, RegisterID dst)
+    void movl_mr(int offset, RegisterID base, RegisterID index, int scale, RegisterID dst)
     {
         m_buffer->putByte(OP_MOV_GvEv);
@@ -512 +512 @@
     }
 
-    void emitMovzwl_mr(int offset, RegisterID base, RegisterID dst)
+    void movzwl_mr(int offset, RegisterID base, RegisterID dst)
     {
         m_buffer->putByte(OP_2BYTE_ESCAPE);
@@ -519 +519 @@
     }
 
-    void emitMovzwl_mr(RegisterID base, RegisterID index, int scale, RegisterID dst)
+    void movzwl_mr(RegisterID base, RegisterID index, int scale, RegisterID dst)
     {
         m_buffer->putByte(OP_2BYTE_ESCAPE);
@@ -526 +526 @@
     }
 
-    void emitMovzwl_mr(int offset, RegisterID base, RegisterID index, int scale, RegisterID dst)
+    void movzwl_mr(int offset, RegisterID base, RegisterID index, int scale, RegisterID dst)
     {
         m_buffer->putByte(OP_2BYTE_ESCAPE);
@@ -533 +533 @@
     }
 
-    void emitMovl_rm(RegisterID src, RegisterID base)
+    void movl_rm(RegisterID src, RegisterID base)
     {
         m_buffer->putByte(OP_MOV_EvGv);
@@ -539 +539 @@
     }
 
-    void emitMovl_rm(RegisterID src, int offset, RegisterID base)
+    void movl_rm(RegisterID src, int offset, RegisterID base)
     {
         m_buffer->ensureSpace(MAX_INSTRUCTION_SIZE);
@@ -546 +546 @@
     }
     
-    void emitMovl_rm(RegisterID src, int offset, RegisterID base, RegisterID index, int scale)
+    void movl_rm(RegisterID src, int offset, RegisterID base, RegisterID index, int scale)
     {
         m_buffer->putByte(OP_MOV_EvGv);
@@ -552 +552 @@
     }
     
-    void emitMovl_i32r(int imm, RegisterID dst)
+    void movl_i32r(int imm, RegisterID dst)
     {
         m_buffer->putByte(OP_GROUP11_EvIz);
@@ -559 +559 @@
     }
 
-    void emitMovl_i32m(int imm, int offset, RegisterID base)
+    void movl_i32m(int imm, int offset, RegisterID base)
     {
         m_buffer->ensureSpace(MAX_INSTRUCTION_SIZE);
@@ -567 +567 @@
     }
 
-    void emitMovl_i32m(int imm, void* addr)
+    void movl_i32m(int imm, void* addr)
     {
         m_buffer->putByte(OP_GROUP11_EvIz);
@@ -574 +574 @@
     }
 
-    void emitLeal_mr(int offset, RegisterID base, RegisterID dst)
+    void leal_mr(int offset, RegisterID base, RegisterID dst)
     {
         m_buffer->putByte(OP_LEA);
@@ -580 +580 @@
     }
 
-    void emitRet()
+    void ret()
     {
         m_buffer->putByte(OP_RET);
     }
     
-    void emitJmpN_r(RegisterID dst)
+    void jmp_r(RegisterID dst)
     {
         m_buffer->putByte(OP_GROUP5_Ev);
@@ -591 +591 @@
     }
     
-    void emitJmpN_m(int offset, RegisterID base)
+    void jmp_m(int offset, RegisterID base)
     {
         m_buffer->putByte(OP_GROUP5_Ev);
@@ -597 +597 @@
     }
     
-    void emitCallN_r(RegisterID dst)
+    void call_r(RegisterID dst)
     {
         m_buffer->putByte(OP_GROUP5_Ev);