Changeset 39796 in webkit for trunk/JavaScriptCore/interpreter

Timestamp:

Jan 11, 2009, 8:48:39 AM (16 years ago)

Author:

[email protected]

Message:

Bug 23128: get/put_by_val need to respecialise in the face of ByteArray
<​https://bugs.webkit.org/show_bug.cgi?id=23128>

Reviewed by Anders Carlsson.

Fairly simple patch, add specialised versions of cti_op_get/put_by_val
that assume ByteArray, thus avoiding a few branches in the case of bytearray
manipulation.

No effect on SunSpider. 15% win on the original testcase.

Location:

trunk/JavaScriptCore/interpreter

Files:

• Interpreter.cpp (modified) (4 diffs)
• Interpreter.h (modified) (1 diff)

trunk/JavaScriptCore/interpreter/Interpreter.cpp

@@ -5118 +5118 @@
         } else if (interpreter->isJSString(baseValue) && asString(baseValue)->canGetIndex(i))
             return JSValuePtr::encode(asString(baseValue)->getIndex(ARG_globalData, i));
-        else if (interpreter->isJSByteArray(baseValue) && asByteArray(baseValue)->canAccessIndex(i))
+        else if (interpreter->isJSByteArray(baseValue) && asByteArray(baseValue)->canAccessIndex(i)) {
+            ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_val_byte_array));
             return JSValuePtr::encode(asByteArray(baseValue)->getIndex(i));
-        else
+        } else
             result = baseValue->get(callFrame, i);
     } else {
@@ -5127 +5128 @@
     }
 
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValuePtr::encode(result);
+}
+
+JSValueEncodedAsPointer* Interpreter::cti_op_get_by_val_byte_array(STUB_ARGS)
+{
+    BEGIN_STUB_FUNCTION();
+    
+    CallFrame* callFrame = ARG_callFrame;
+    Interpreter* interpreter = ARG_globalData->interpreter;
+    
+    JSValuePtr baseValue = ARG_src1;
+    JSValuePtr subscript = ARG_src2;
+    
+    JSValuePtr result;
+    unsigned i;
+    
+    bool isUInt32 = JSImmediate::getUInt32(subscript, i);
+    if (LIKELY(isUInt32)) {
+        if (interpreter->isJSByteArray(baseValue) && asByteArray(baseValue)->canAccessIndex(i))
+            return JSValuePtr::encode(asByteArray(baseValue)->getIndex(i));
+        else {
+            result = baseValue->get(callFrame, i);
+            if (!interpreter->isJSByteArray(baseValue))
+                ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_get_by_val));
+        }
+    } else {
+        Identifier property(callFrame, subscript->toString(callFrame));
+        result = baseValue->get(callFrame, property);
+    }
+    
     CHECK_FOR_EXCEPTION_AT_END();
     return JSValuePtr::encode(result);
@@ -5215 +5247 @@
             JSByteArray* jsByteArray = asByteArray(baseValue);
             double dValue = 0;
+            ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_put_by_val_byte_array));
             if (JSImmediate::isNumber(value)) {
                 jsByteArray->setIndex(i, JSImmediate::getTruncatedInt32(value));
@@ -5262 +5295 @@
 }
 
+void Interpreter::cti_op_put_by_val_byte_array(STUB_ARGS)
+{
+    BEGIN_STUB_FUNCTION();
+    
+    CallFrame* callFrame = ARG_callFrame;
+    Interpreter* interpreter = ARG_globalData->interpreter;
+    
+    JSValuePtr baseValue = ARG_src1;
+    JSValuePtr subscript = ARG_src2;
+    JSValuePtr value = ARG_src3;
+    
+    unsigned i;
+    
+    bool isUInt32 = JSImmediate::getUInt32(subscript, i);
+    if (LIKELY(isUInt32)) {
+        if (interpreter->isJSByteArray(baseValue) && asByteArray(baseValue)->canAccessIndex(i)) {
+            JSByteArray* jsByteArray = asByteArray(baseValue);
+            double dValue = 0;
+            if (JSImmediate::isNumber(value)) {
+                jsByteArray->setIndex(i, JSImmediate::getTruncatedInt32(value));
+                return;
+            } else if (fastIsNumber(value, dValue)) {
+                jsByteArray->setIndex(i, dValue);
+                return;
+            } else
+                baseValue->put(callFrame, i, value);
+        } else {
+            if (!interpreter->isJSByteArray(baseValue))
+                ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, reinterpret_cast<void*>(cti_op_put_by_val));
+            baseValue->put(callFrame, i, value);
+        }
+    } else {
+        Identifier property(callFrame, subscript->toString(callFrame));
+        if (!ARG_globalData->exception) { // Don't put to an object if toString threw an exception.
+            PutPropertySlot slot;
+            baseValue->put(callFrame, property, value, slot);
+        }
+    }
+    
+    CHECK_FOR_EXCEPTION_AT_END();
+}
+
 JSValueEncodedAsPointer* Interpreter::cti_op_lesseq(STUB_ARGS)
 {

trunk/JavaScriptCore/interpreter/Interpreter.h

@@ -222 +222 @@
         static JSValueEncodedAsPointer* JIT_STUB cti_op_construct_NotJSConstruct(STUB_ARGS);
         static JSValueEncodedAsPointer* JIT_STUB cti_op_get_by_val(STUB_ARGS);
+        static JSValueEncodedAsPointer* JIT_STUB cti_op_get_by_val_byte_array(STUB_ARGS);
         static VoidPtrPair JIT_STUB cti_op_resolve_func(STUB_ARGS);
         static JSValueEncodedAsPointer* JIT_STUB cti_op_sub(STUB_ARGS);
         static void JIT_STUB cti_op_put_by_val(STUB_ARGS);
         static void JIT_STUB cti_op_put_by_val_array(STUB_ARGS);
+        static void JIT_STUB cti_op_put_by_val_byte_array(STUB_ARGS);
         static JSValueEncodedAsPointer* JIT_STUB cti_op_lesseq(STUB_ARGS);
         static int JIT_STUB cti_op_loop_if_true(STUB_ARGS);