Changeset 155420 in webkit

Timestamp:

Sep 9, 2013 11:09:40 PM (11 years ago)

Author:

msaboff@apple.com

Message:

There should be one "invalid" virtual register constant
​https://bugs.webkit.org/show_bug.cgi?id=121057

Reviewed by Filip Pizlo.

Unify all references to an invalid virtual register to be the enum InvalidVirtualRegister.
Changed the value of InvalidVirtualRegister to be maximum integer value.

• bytecode/CodeBlock.h:

(JSC::CodeBlock::setArgumentsRegister):
(JSC::CodeBlock::usesArguments):

• bytecode/LazyOperandValueProfile.h:

(JSC::LazyOperandValueProfileKey::LazyOperandValueProfileKey):
(JSC::LazyOperandValueProfileKey::operator!):
(JSC::LazyOperandValueProfileKey::isHashTableDeletedValue):
(JSC::LazyOperandValueProfile::LazyOperandValueProfile):

• bytecode/UnlinkedCodeBlock.cpp:

(JSC::UnlinkedCodeBlock::UnlinkedCodeBlock):

• bytecode/UnlinkedCodeBlock.h:

(JSC::UnlinkedCodeBlock::usesArguments):
(JSC::UnlinkedCodeBlock::usesGlobalObject):

• bytecode/VirtualRegister.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/CodeBlock.h (modified) (2 diffs)
• bytecode/LazyOperandValueProfile.h (modified) (6 diffs)
• bytecode/UnlinkedCodeBlock.cpp (modified) (1 diff)
• bytecode/UnlinkedCodeBlock.h (modified) (2 diffs)
• bytecode/VirtualRegister.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-09-09  Michael Saboff  <msaboff@apple.com>
+
+        There should be one "invalid" virtual register constant
+        https://bugs.webkit.org/show_bug.cgi?id=121057
+
+        Reviewed by Filip Pizlo.
+
+        Unify all references to an invalid virtual register to be the enum InvalidVirtualRegister.
+        Changed the value of InvalidVirtualRegister to be maximum integer value.
+
+        * bytecode/CodeBlock.h:
+        (JSC::CodeBlock::setArgumentsRegister):
+        (JSC::CodeBlock::usesArguments):
+        * bytecode/LazyOperandValueProfile.h:
+        (JSC::LazyOperandValueProfileKey::LazyOperandValueProfileKey):
+        (JSC::LazyOperandValueProfileKey::operator!):
+        (JSC::LazyOperandValueProfileKey::isHashTableDeletedValue):
+        (JSC::LazyOperandValueProfile::LazyOperandValueProfile):
+        * bytecode/UnlinkedCodeBlock.cpp:
+        (JSC::UnlinkedCodeBlock::UnlinkedCodeBlock):
+        * bytecode/UnlinkedCodeBlock.h:
+        (JSC::UnlinkedCodeBlock::usesArguments):
+        (JSC::UnlinkedCodeBlock::usesGlobalObject):
+        * bytecode/VirtualRegister.h:
+
 2013-09-09  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

@@ -325 +325 @@
     void setArgumentsRegister(int argumentsRegister)
     {
-        ASSERT(argumentsRegister != -1);
+        ASSERT(argumentsRegister != (int)InvalidVirtualRegister);
         m_argumentsRegister = argumentsRegister;
         ASSERT(usesArguments());
@@ -355 +355 @@
         return activationRegister();
     }
-    bool usesArguments() const { return m_argumentsRegister != -1; }
+    bool usesArguments() const { return m_argumentsRegister != (int)InvalidVirtualRegister; }
 
     bool needsActivation() const

trunk/Source/JavaScriptCore/bytecode/LazyOperandValueProfile.h

@@ -33 +33 @@
 #include "ConcurrentJITLock.h"
 #include "ValueProfile.h"
+#include "VirtualRegister.h"
 #include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>
@@ -46 +47 @@
     LazyOperandValueProfileKey()
         : m_bytecodeOffset(0) // 0 = empty value
-        , m_operand(-1) // not a valid operand index in our current scheme
+        , m_operand(InvalidVirtualRegister) // not a valid operand index in our current scheme
     {
     }
@@ -52 +53 @@
     LazyOperandValueProfileKey(WTF::HashTableDeletedValueType)
         : m_bytecodeOffset(1) // 1 = deleted value
-        , m_operand(-1) // not a valid operand index in our current scheme
+        , m_operand(InvalidVirtualRegister) // not a valid operand index in our current scheme
     {
     }
@@ -60 +61 @@
         , m_operand(operand)
     {
-        ASSERT(operand != -1);
+        ASSERT(operand != InvalidVirtualRegister);
     }
     
     bool operator!() const
     {
-        return m_operand == -1;
+        return m_operand == InvalidVirtualRegister;
     }
     
@@ -92 +93 @@
     bool isHashTableDeletedValue() const
     {
-        return m_operand == -1 && m_bytecodeOffset;
+        return m_operand == InvalidVirtualRegister && m_bytecodeOffset;
     }
 private: 
@@ -129 +130 @@
     LazyOperandValueProfile()
         : MinimalValueProfile()
-        , m_operand(-1)
+        , m_operand(InvalidVirtualRegister)
     {
     }

trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp

@@ -195 +195 @@
     , m_numParameters(0)
     , m_vm(vm)
-    , m_argumentsRegister(-1)
-    , m_globalObjectRegister(-1)
+    , m_argumentsRegister((int)InvalidVirtualRegister)
+    , m_globalObjectRegister((int)InvalidVirtualRegister)
     , m_needsFullScopeChain(info.m_needsActivation)
     , m_usesEval(info.m_usesEval)

trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h

@@ -39 +39 @@
 #include "SpecialPointer.h"
 #include "SymbolTable.h"
+#include "VirtualRegister.h"
 
 #include <wtf/Compression.h>
@@ -258 +259 @@
 
     void setArgumentsRegister(int argumentsRegister) { m_argumentsRegister = argumentsRegister; }
-    bool usesArguments() const { return m_argumentsRegister != -1; }
+    bool usesArguments() const { return m_argumentsRegister != (int)InvalidVirtualRegister; }
     int argumentsRegister() const { return m_argumentsRegister; }
 
 
-    bool usesGlobalObject() const { return m_globalObjectRegister != -1; }
+    bool usesGlobalObject() const { return m_globalObjectRegister != (int)InvalidVirtualRegister; }
     void setGlobalObjectRegister(int globalObjectRegister) { m_globalObjectRegister = globalObjectRegister; }
     int globalObjectRegister() const { return m_globalObjectRegister; }

trunk/Source/JavaScriptCore/bytecode/VirtualRegister.h

@@ -34 +34 @@
 // Type for a virtual register number (spill location).
 // Using an enum to make this type-checked at compile time, to avert programmer errors.
-enum VirtualRegister { InvalidVirtualRegister = -1 };
+enum VirtualRegister { InvalidVirtualRegister = 0x7fffffff };
 COMPILE_ASSERT(sizeof(VirtualRegister) == sizeof(int), VirtualRegister_is_32bit);