Changeset 36307 in webkit for trunk/JavaScriptCore/masm

Timestamp:

Sep 9, 2008, 6:11:55 PM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Maciej Stachowiak.

Bug 20755: Create an X86 namespace for register names and other things
<​https://bugs.webkit.org/show_bug.cgi?id=20755>

Create an X86 namespace to put X86 register names. Perhaps I will move
opcode names here later as well.

• 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::emitJumpSlowCaseIfNotImms): (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:
• masm/X86Assembler.h: (JSC::X86::): (JSC::X86Assembler::emitModRm_rm): (JSC::X86Assembler::emitModRm_rm_Unchecked): (JSC::X86Assembler::emitModRm_rmsib):
• wrec/WREC.cpp: (JSC::WRECGenerator::generateNonGreedyQuantifier): (JSC::WRECGenerator::generateGreedyQuantifier): (JSC::WRECGenerator::generateParentheses): (JSC::WRECGenerator::generateBackreference): (JSC::WRECGenerator::gernerateDisjunction):
• wrec/WREC.h:

File:

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

trunk/JavaScriptCore/masm/X86Assembler.h

@@ -148 +148 @@
 #define CAN_SIGN_EXTEND_8_32(value) (value == ((int)(signed char)value))
 
-class X86Assembler {
-public:
+namespace X86 {
     typedef enum {
         eax,
@@ -160 +159 @@
         edi,
 
-        NO_BASE  = ebp,
-        HAS_SIB  = esp,
-        NO_SCALE = esp,
+        noBase = ebp,
+        hasSib = esp,
+        noScale = esp,
     } RegisterID;
+}
+
+class X86Assembler {
+public:
+    typedef X86::RegisterID RegisterID;
 
     typedef enum {
@@ -789 +793 @@
     void emitModRm_rm(RegisterID reg, void* addr)
     {
-        m_buffer->putByte(MODRM(0, reg, NO_BASE));
+        m_buffer->putByte(MODRM(0, reg, X86::noBase));
         m_buffer->putInt((int)addr);
     }
@@ -795 +799 @@
     void emitModRm_rm(RegisterID reg, RegisterID base)
     {
-        if (base == esp) {
-            m_buffer->putByte(MODRM(0, reg, HAS_SIB));
-            m_buffer->putByte(SIB(0, NO_SCALE, esp));
+        if (base == X86::esp) {
+            m_buffer->putByte(MODRM(0, reg, X86::hasSib));
+            m_buffer->putByte(SIB(0, X86::noScale, X86::esp));
         } else
             m_buffer->putByte(MODRM(0, reg, base));
@@ -804 +808 @@
     void emitModRm_rm_Unchecked(RegisterID reg, RegisterID base, int offset)
     {
-        if (base == esp) {
+        if (base == X86::esp) {
             if (CAN_SIGN_EXTEND_8_32(offset)) {
-                m_buffer->putByteUnchecked(MODRM(1, reg, HAS_SIB));
-                m_buffer->putByteUnchecked(SIB(0, NO_SCALE, esp));
+                m_buffer->putByteUnchecked(MODRM(1, reg, X86::hasSib));
+                m_buffer->putByteUnchecked(SIB(0, X86::noScale, X86::esp));
                 m_buffer->putByteUnchecked(offset);
             } else {
-                m_buffer->putByteUnchecked(MODRM(2, reg, HAS_SIB));
-                m_buffer->putByteUnchecked(SIB(0, NO_SCALE, esp));
+                m_buffer->putByteUnchecked(MODRM(2, reg, X86::hasSib));
+                m_buffer->putByteUnchecked(SIB(0, X86::noScale, X86::esp));
                 m_buffer->putIntUnchecked(offset);
             }
@@ -837 +841 @@
             shift++;
     
-        m_buffer->putByte(MODRM(0, reg, HAS_SIB));
+        m_buffer->putByte(MODRM(0, reg, X86::hasSib));
         m_buffer->putByte(SIB(shift, index, base));
     }
@@ -848 +852 @@
     
         if (CAN_SIGN_EXTEND_8_32(offset)) {
-            m_buffer->putByte(MODRM(1, reg, HAS_SIB));
+            m_buffer->putByte(MODRM(1, reg, X86::hasSib));
             m_buffer->putByte(SIB(shift, index, base));
             m_buffer->putByte(offset);
         } else {
-            m_buffer->putByte(MODRM(2, reg, HAS_SIB));
+            m_buffer->putByte(MODRM(2, reg, X86::hasSib));
             m_buffer->putByte(SIB(shift, index, base));
             m_buffer->putInt(offset);