Changeset 160522 in webkit

Timestamp:

Dec 12, 2013, 6:06:28 PM (12 years ago)

Author:

msaboff@apple.com

Message:

CStack Branch: Add equivalent values from MaxFrameExtentForSlowPathCall.h to lint files
​https://bugs.webkit.org/show_bug.cgi?id=125669

Reviewed by Mark Lam.

Added platform specific value of maxFrameExtentForSlowPathCall to llint code.
Also added ASSERTs to check that we are using the save value in both places.

Per review comments, I also updated the CPU(ARM)

... in MaxFrameExtentForSlowPathCall.h

to be just CPU(ARM) since it covers all ARM 32 bit variants.

• assembler/MaxFrameExtentForSlowPathCall.h:
• llint/LLIntData.cpp:

(JSC::LLInt::Data::performAssertions):

• llint/LowLevelInterpreter.asm:

Location:

branches/jsCStack/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/MaxFrameExtentForSlowPathCall.h (modified) (1 diff)
• llint/LLIntData.cpp (modified) (2 diffs)
• llint/LowLevelInterpreter.asm (modified) (1 diff)

branches/jsCStack/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-12-12  Michael Saboff  <msaboff@apple.com>
+
+        CStack Branch: Add equivalent values from MaxFrameExtentForSlowPathCall.h to lint files
+        https://bugs.webkit.org/show_bug.cgi?id=125669
+
+        Reviewed by Mark Lam.
+
+        Added platform specific value of maxFrameExtentForSlowPathCall to llint code.
+        Also added ASSERTs to check that we are using the save value in both places.
+
+        Per review comments, I also updated the CPU(ARM) || ... in MaxFrameExtentForSlowPathCall.h
+        to be just CPU(ARM) since it covers all ARM 32 bit variants.
+
+        * assembler/MaxFrameExtentForSlowPathCall.h:
+        * llint/LLIntData.cpp:
+        (JSC::LLInt::Data::performAssertions):
+        * llint/LowLevelInterpreter.asm:
+
 2013-12-12  Michael Saboff  <msaboff@apple.com>
 

branches/jsCStack/Source/JavaScriptCore/assembler/MaxFrameExtentForSlowPathCall.h

@@ -52 +52 @@
 static const size_t maxFrameExtentForSlowPathCall = 0;
 
-#elif CPU(ARM) || CPU(ARM_TRADITIONAL) || CPU(ARM_THUMB2)
+#elif CPU(ARM)
 // First four args in registers, remaining 4 args on stack.
 static const size_t maxFrameExtentForSlowPathCall = 16;

branches/jsCStack/Source/JavaScriptCore/llint/LLIntData.cpp

@@ -34 +34 @@
 #include "JSScope.h"
 #include "LLIntCLoop.h"
+#include "MaxFrameExtentForSlowPathCall.h"
 #include "Opcode.h"
 #include "PropertyOffset.h"
@@ -125 +126 @@
     ASSERT(ValueNull == TagBitTypeOther);
 #endif
+#if CPU(X86_64) || CPU(ARM64) || ENABLE(LLINT_C_LOOP)
+    ASSERT(maxFrameExtentForSlowPathCall == 0);
+#elif CPU(ARM) || CPU(SH4)
+    ASSERT(maxFrameExtentForSlowPathCall == 16);
+#elif CPU(X86) || CPU(MIPS)
+    ASSERT(maxFrameExtentForSlowPathCall == 32);
+#endif
     ASSERT(StringType == 5);
     ASSERT(ObjectType == 17);

branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm

@@ -72 +72 @@
 const DeletedValueTag = -7
 const LowestTag = DeletedValueTag
+end
+
+if X86_64 or ARM64 or C_LOOP
+const maxFrameExtentForSlowPathCall = 0
+elsif ARM or ARMv7_TRADITIONAL or ARMv7 or SH4
+const maxFrameExtentForSlowPathCall = 16
+elsif X86 or MIPS
+const maxFrameExtentForSlowPathCall = 32
 end