JavaScriptCore-903.tar.gz

[apple/javascriptcore.git] / runtime / PropertySlot.h

diff --git a/runtime/PropertySlot.h b/runtime/PropertySlot.h
index de9ddc99822a633f024e96362188d9d5c4ab6bc0..ce29ac4e6c7bb85553e7abcb79741adba36104f0 100644 (file)
--- a/runtime/PropertySlot.h
+++ b/runtime/PropertySlot.h
@@ -32,8 +32,7 @@ namespace JSC {
     class ExecState;
     class JSObject;
 
     class ExecState;
     class JSObject;
 

-#define JSC_VALUE_SLOT_MARKER 0
-#define JSC_REGISTER_SLOT_MARKER reinterpret_cast<GetValueFunc>(1)
+#define JSC_VALUE_MARKER 0

 #define INDEX_GETTER_MARKER reinterpret_cast<GetValueFunc>(2)
 #define GETTER_FUNCTION_MARKER reinterpret_cast<GetValueFunc>(3)
 
 #define INDEX_GETTER_MARKER reinterpret_cast<GetValueFunc>(2)
 #define GETTER_FUNCTION_MARKER reinterpret_cast<GetValueFunc>(3)
 


@@ -67,10 +66,8 @@ namespace JSC {
 
         JSValue getValue(ExecState* exec, const Identifier& propertyName) const
         {
 
         JSValue getValue(ExecState* exec, const Identifier& propertyName) const
         {

-            if (m_getValue == JSC_VALUE_SLOT_MARKER)
-                return *m_data.valueSlot;
-            if (m_getValue == JSC_REGISTER_SLOT_MARKER)
-                return (*m_data.registerSlot).jsValue();
+            if (m_getValue == JSC_VALUE_MARKER)
+                return m_value;

             if (m_getValue == INDEX_GETTER_MARKER)
                 return m_getIndexValue(exec, slotBase(), index());
             if (m_getValue == GETTER_FUNCTION_MARKER)
             if (m_getValue == INDEX_GETTER_MARKER)
                 return m_getIndexValue(exec, slotBase(), index());
             if (m_getValue == GETTER_FUNCTION_MARKER)


@@ -80,10 +77,8 @@ namespace JSC {
 
         JSValue getValue(ExecState* exec, unsigned propertyName) const
         {
 
         JSValue getValue(ExecState* exec, unsigned propertyName) const
         {

-            if (m_getValue == JSC_VALUE_SLOT_MARKER)
-                return *m_data.valueSlot;
-            if (m_getValue == JSC_REGISTER_SLOT_MARKER)
-                return (*m_data.registerSlot).jsValue();
+            if (m_getValue == JSC_VALUE_MARKER)
+                return m_value;

             if (m_getValue == INDEX_GETTER_MARKER)
                 return m_getIndexValue(exec, m_slotBase, m_data.index);
             if (m_getValue == GETTER_FUNCTION_MARKER)
             if (m_getValue == INDEX_GETTER_MARKER)
                 return m_getIndexValue(exec, m_slotBase, m_data.index);
             if (m_getValue == GETTER_FUNCTION_MARKER)


@@ -100,50 +95,32 @@ namespace JSC {
             return m_offset;
         }
 
             return m_offset;
         }
 

-        void setValueSlot(JSValue* valueSlot) 
+        void setValue(JSValue slotBase, JSValue value)

         {
         {

-            ASSERT(valueSlot);
-            clearBase();
+            ASSERT(value);

             clearOffset();
             clearOffset();

-            m_getValue = JSC_VALUE_SLOT_MARKER;
-            m_data.valueSlot = valueSlot;
-        }
-        
-        void setValueSlot(JSValue slotBase, JSValue* valueSlot)
-        {
-            ASSERT(valueSlot);
-            m_getValue = JSC_VALUE_SLOT_MARKER;
+            m_getValue = JSC_VALUE_MARKER;

             m_slotBase = slotBase;
             m_slotBase = slotBase;

-            m_data.valueSlot = valueSlot;
+            m_value = value;

         }
         
         }
         

-        void setValueSlot(JSValue slotBase, JSValue* valueSlot, size_t offset)
+        void setValue(JSValue slotBase, JSValue value, size_t offset)

         {
         {

-            ASSERT(valueSlot);
-            m_getValue = JSC_VALUE_SLOT_MARKER;
+            ASSERT(value);
+            m_getValue = JSC_VALUE_MARKER;

             m_slotBase = slotBase;
             m_slotBase = slotBase;

-            m_data.valueSlot = valueSlot;
+            m_value = value;

             m_offset = offset;
             m_cachedPropertyType = Value;
         }
             m_offset = offset;
             m_cachedPropertyType = Value;
         }

-        
+

         void setValue(JSValue value)
         {
             ASSERT(value);
             clearBase();
             clearOffset();
         void setValue(JSValue value)
         {
             ASSERT(value);
             clearBase();
             clearOffset();

-            m_getValue = JSC_VALUE_SLOT_MARKER;
+            m_getValue = JSC_VALUE_MARKER;

             m_value = value;
             m_value = value;

-            m_data.valueSlot = &m_value;
-        }
-
-        void setRegisterSlot(Register* registerSlot)
-        {
-            ASSERT(registerSlot);
-            clearBase();
-            clearOffset();
-            m_getValue = JSC_REGISTER_SLOT_MARKER;
-            m_data.registerSlot = registerSlot;

         }
 
         void setCustom(JSValue slotBase, GetValueFunc getValue)
         }
 
         void setCustom(JSValue slotBase, GetValueFunc getValue)


@@ -251,8 +228,6 @@ namespace JSC {
         JSValue m_slotBase;
         union {
             JSObject* getterFunc;
         JSValue m_slotBase;
         union {
             JSObject* getterFunc;

-            JSValue* valueSlot;
-            Register* registerSlot;

             unsigned index;
         } m_data;
 
             unsigned index;
         } m_data;