Changeset 160665 in webkit

Timestamp:

Dec 16, 2013 2:52:36 PM (10 years ago)

Author:

mark.lam@apple.com

Message:

Change slow path result to take a void* instead of a ExecState*.
​https://bugs.webkit.org/show_bug.cgi?id=125802.

Reviewed by Filip Pizlo.

This is in preparation for C Stack OSR entry work that is coming soon.
In the OSR entry case, we'll be returning a topOfFrame pointer value
instead of the ExecState*.

• offlineasm/cloop.rb:
• runtime/CommonSlowPaths.h:

(JSC::encodeResult):
(JSC::decodeResult):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• offlineasm/cloop.rb (modified) (1 diff)
• runtime/CommonSlowPaths.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-12-16  Mark Lam  <mark.lam@apple.com>
+
+        Change slow path result to take a void* instead of a ExecState*.
+        https://bugs.webkit.org/show_bug.cgi?id=125802.
+
+        Reviewed by Filip Pizlo.
+
+        This is in preparation for C Stack OSR entry work that is coming soon.
+        In the OSR entry case, we'll be returning a topOfFrame pointer value
+        instead of the ExecState*.
+
+        * offlineasm/cloop.rb:
+        * runtime/CommonSlowPaths.h:
+        (JSC::encodeResult):
+        (JSC::decodeResult):
+
 2013-12-16  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/JavaScriptCore/offlineasm/cloop.rb

@@ -559 +559 @@
     $asm.putc "    Instruction* pc = CAST<Instruction*>(#{operands[2].clValue(:voidPtr)});"
     $asm.putc "    SlowPathReturnType result = #{operands[0].cLabel}(exec, pc);"
-    $asm.putc "    decodeResult(result, t0.instruction, t1.execState);"
+    $asm.putc "    decodeResult(result, t0.instruction, t1.vp);"
     $asm.putc "}"
 end

trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h

@@ -106 +106 @@
 struct SlowPathReturnType {
     void* a;
-    ExecState* b;
+    void* b;
 };
 
-inline SlowPathReturnType encodeResult(void* a, ExecState* b)
+inline SlowPathReturnType encodeResult(void* a, void* b)
 {
     SlowPathReturnType result;
@@ -117 +117 @@
 }
 
-inline void decodeResult(SlowPathReturnType result, void*& a, ExecState*& b)
+inline void decodeResult(SlowPathReturnType result, void*& a, void*& b)
 {
     a = result.a;
@@ -129 +129 @@
     struct {
         void* a;
-        ExecState* b;
+        void* b;
     } pair;
     int64_t i;
 } SlowPathReturnTypeEncoding;
 
-inline SlowPathReturnType encodeResult(void* a, ExecState* b)
+inline SlowPathReturnType encodeResult(void* a, void* b)
 {
     SlowPathReturnTypeEncoding u;
@@ -142 +142 @@
 }
 
-inline void decodeResult(SlowPathReturnType result, void*& a, ExecState*& b)
+inline void decodeResult(SlowPathReturnType result, void*& a, void*& b)
 {
     SlowPathReturnTypeEncoding u;