Changeset 85226 in webkit

Timestamp:

Apr 28, 2011 12:29:11 PM (13 years ago)

Author:

oliver@apple.com

Message:

2011-04-28 Oliver Hunt <​oliver@apple.com>

Reviewed by Gavin Barraclough.

Only need a single implementation of testPrototype
​https://bugs.webkit.org/show_bug.cgi?id=59724

Remove excess copy of identical testPrototype() code

• jit/JITPropertyAccess.cpp: (JSC::JIT::testPrototype):
• jit/JITPropertyAccess32_64.cpp:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JITPropertyAccess.cpp (modified) (4 diffs)
• jit/JITPropertyAccess32_64.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-04-28  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Gavin Barraclough.
+
+        Only need a single implementation of testPrototype
+        https://bugs.webkit.org/show_bug.cgi?id=59724
+
+        Remove excess copy of identical testPrototype() code
+
+        * jit/JITPropertyAccess.cpp:
+        (JSC::JIT::testPrototype):
+        * jit/JITPropertyAccess32_64.cpp:
+
 2011-04-28  Xan Lopez  <xlopez@igalia.com>
 

trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp

@@ -27 +27 @@
 
 #if ENABLE(JIT)
-#if USE(JSVALUE64)
 #include "JIT.h"
 
@@ -50 +49 @@
 
 namespace JSC {
+#if USE(JSVALUE64)
 
 JIT::CodePtr JIT::stringGetByValStubGenerator(JSGlobalData* globalData, ExecutablePool* pool)
@@ -553 +553 @@
 {
     loadPtr(static_cast<void*>(&base->m_propertyStorage[cachedOffset]), result);
-}
-
-void JIT::testPrototype(JSValue prototype, JumpList& failureCases)
-{
-    if (prototype.isNull())
-        return;
-
-    // We have a special case for X86_64 here because X86 instructions that take immediate values
-    // only take 32 bit immediate values, wheras the pointer constants we are using here are 64 bit
-    // values.  In the non X86_64 case, the generated code is slightly more efficient because it uses
-    // two less instructions and doesn't require any scratch registers.
-#if CPU(X86_64)
-    move(TrustedImmPtr(prototype.asCell()->structure()), regT3);
-    failureCases.append(branchPtr(NotEqual, AbsoluteAddress(prototype.asCell()->addressOfStructure()), regT3));
-#else
-    failureCases.append(branchPtr(NotEqual, AbsoluteAddress(prototype.asCell()->addressOfStructure()), TrustedImmPtr(prototype.asCell()->structure())));
-#endif
 }
 
@@ -1049 +1032 @@
 #endif // !ENABLE(JIT_OPTIMIZE_PROPERTY_ACCESS)
 
+#endif // USE(JSVALUE64)
+
+void JIT::testPrototype(JSValue prototype, JumpList& failureCases)
+{
+    if (prototype.isNull())
+        return;
+    
+    // We have a special case for X86_64 here because X86 instructions that take immediate values
+    // only take 32 bit immediate values, wheras the pointer constants we are using here are 64 bit
+    // values. In the non X86_64 case, the generated code is slightly more efficient because it uses
+    // two less instructions and doesn't require any scratch registers.
+#if CPU(X86_64)
+    move(TrustedImmPtr(prototype.asCell()->structure()), regT3);
+    failureCases.append(branchPtr(NotEqual, AbsoluteAddress(prototype.asCell()->addressOfStructure()), regT3));
+#else
+    failureCases.append(branchPtr(NotEqual, AbsoluteAddress(prototype.asCell()->addressOfStructure()), TrustedImmPtr(prototype.asCell()->structure())));
+#endif
+}
+
 } // namespace JSC
 
-#endif // USE(JSVALUE64)
 #endif // ENABLE(JIT)

trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp

@@ -568 +568 @@
     load32(reinterpret_cast<char*>(&base->m_propertyStorage[cachedOffset]) + OBJECT_OFFSETOF(JSValue, u.asBits.payload), resultPayload);
     load32(reinterpret_cast<char*>(&base->m_propertyStorage[cachedOffset]) + OBJECT_OFFSETOF(JSValue, u.asBits.tag), resultTag);
-}
-
-void JIT::testPrototype(JSValue prototype, JumpList& failureCases)
-{
-    if (prototype.isNull())
-        return;
-    
-    // We have a special case for X86_64 here because X86 instructions that take immediate values
-    // only take 32 bit immediate values, wheras the pointer constants we are using here are 64 bit
-    // values.  In the non X86_64 case, the generated code is slightly more efficient because it uses
-    // two less instructions and doesn't require any scratch registers.
-#if CPU(X86_64)
-    move(TrustedImmPtr(prototype.asCell()->structure()), regT3);
-    failureCases.append(branchPtr(NotEqual, AbsoluteAddress(prototype.asCell()->addressOfStructure()), regT3));
-#else
-    failureCases.append(branchPtr(NotEqual, AbsoluteAddress(prototype.asCell()->addressOfStructure()), TrustedImmPtr(prototype.asCell()->structure())));
-#endif
 }