Changeset 38229 in webkit for trunk/JavaScriptCore

Timestamp:

Nov 7, 2008, 12:41:47 PM (17 years ago)

Author:

[email protected]

Message:

2008-11-07 Cameron Zwarich <​[email protected]>

Reviewed by Geoff Garen.

Bug 22129: Move CTI::isConstant() to CodeBlock
<​https://bugs.webkit.org/show_bug.cgi?id=22129>

• VM/CTI.cpp: (JSC::CTI::emitGetArg): (JSC::CTI::emitGetPutArg): (JSC::CTI::getConstantImmediateNumericArg): (JSC::CTI::printOpcodeOperandTypes): (JSC::CTI::privateCompileMainPass):
• VM/CTI.h:
• VM/CodeBlock.h: (JSC::CodeBlock::isConstant):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/CTI.cpp (modified) (7 diffs)
• VM/CTI.h (modified) (1 diff)
• VM/CodeBlock.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-11-07  Cameron Zwarich  <[email protected]>
+
+        Reviewed by Geoff Garen.
+
+        Bug 22129: Move CTI::isConstant() to CodeBlock
+        <https://bugs.webkit.org/show_bug.cgi?id=22129>
+
+        * VM/CTI.cpp:
+        (JSC::CTI::emitGetArg):
+        (JSC::CTI::emitGetPutArg):
+        (JSC::CTI::getConstantImmediateNumericArg):
+        (JSC::CTI::printOpcodeOperandTypes):
+        (JSC::CTI::privateCompileMainPass):
+        * VM/CTI.h:
+        * VM/CodeBlock.h:
+        (JSC::CodeBlock::isConstant):
+
 2008-11-07  Alp Toker  <[email protected]>
 

trunk/JavaScriptCore/VM/CTI.cpp

@@ -169 +169 @@
 #endif
 
-ALWAYS_INLINE bool CTI::isConstant(int src)
-{
-    return src >= m_codeBlock->numVars && src < m_codeBlock->numVars + m_codeBlock->numConstants;
-}
-
 ALWAYS_INLINE JSValue* CTI::getConstant(CallFrame* callFrame, int src)
 {
@@ -188 +183 @@
 {
     // TODO: we want to reuse values that are already in registers if we can - add a register allocator!
-    if (isConstant(src)) {
+    if (m_codeBlock->isConstant(src)) {
         JSValue* js = getConstant(m_callFrame, src);
         m_jit.movl_i32r(asInteger(js), dst);
@@ -198 +193 @@
 ALWAYS_INLINE void CTI::emitGetPutArg(unsigned src, unsigned offset, X86Assembler::RegisterID scratch)
 {
-    if (isConstant(src)) {
+    if (m_codeBlock->isConstant(src)) {
         JSValue* js = getConstant(m_callFrame, src);
         m_jit.movl_i32m(asInteger(js), offset + sizeof(void*), X86::esp);
@@ -220 +215 @@
 ALWAYS_INLINE JSValue* CTI::getConstantImmediateNumericArg(unsigned src)
 {
-    if (isConstant(src)) {
+    if (m_codeBlock->isConstant(src)) {
         JSValue* js = getConstant(m_callFrame, src);
         return JSImmediate::isNumber(js) ? js : noValue();
@@ -279 +274 @@
 {
     char which1 = '*';
-    if (isConstant(src1)) {
+    if (m_codeBlock->isConstant(src1)) {
         JSValue* js = getConstant(m_callFrame, src1);
         which1 = 
@@ -293 +288 @@
     }
     char which2 = '*';
-    if (isConstant(src2)) {
+    if (m_codeBlock->isConstant(src2)) {
         JSValue* js = getConstant(m_callFrame, src2);
         which2 = 
@@ -1007 +1002 @@
         case op_mov: {
             unsigned src = instruction[i + 2].u.operand;
-            if (isConstant(src))
+            if (m_codeBlock->isConstant(src))
                 m_jit.movl_i32r(asInteger(getConstant(m_callFrame, src)), X86::eax);
             else

trunk/JavaScriptCore/VM/CTI.h

@@ -358 +358 @@
         static uintptr_t asInteger(JSValue*);
 
-        bool isConstant(int src);
         JSValue* getConstant(CallFrame*, int src);
 

trunk/JavaScriptCore/VM/CodeBlock.h

@@ -290 +290 @@
         }
 
+        ALWAYS_INLINE bool isConstant(int index)
+        {
+            return index >= numVars && index < numVars + numConstants;
+        }
+
 #if !defined(NDEBUG) || ENABLE_OPCODE_SAMPLING
         void dump(ExecState*) const;