Changeset 155820 in webkit for trunk/Source/JavaScriptCore/bytecode/ValueRecovery.h

Timestamp:

Sep 15, 2013, 11:53:23 AM (12 years ago)

Author:

[email protected]

Message:

Deoptimize deoptimization: make DFGOSRExitCompiler64.cpp more hackable
​https://bugs.webkit.org/show_bug.cgi?id=121374

Reviewed by Geoffrey Garen.

This reduces the size of DFGOSRExitCompiler64.cpp by almost 50%, and makes it
super easy to add new recovery kinds. For recoveries that involve reboxing, it
allows you to keep most of the code common between the on-stack and in-reg
cases: they all get funneled through the "load from scratch buffer, convert,
and then store to stack" logic.

This opens up a bunch of possibilities. It'll make adding Int48 much easier,
and it probably will come in handy as we do various DFG stack layout changes in
support of the FTL.

• bytecode/ValueRecovery.h:

(JSC::ValueRecovery::dumpInContext):
(JSC::ValueRecovery::dump):

• dfg/DFGOSRExitCompiler.cpp:

(JSC::DFG::shortOperandsDump):

• dfg/DFGOSRExitCompiler64.cpp:

(JSC::DFG::OSRExitCompiler::compileExit):

File:

• trunk/Source/JavaScriptCore/bytecode/ValueRecovery.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/bytecode/ValueRecovery.h

@@ -36 +36 @@
 namespace JSC {
 
+struct DumpContext;
+
 // Describes how to recover a given bytecode virtual register at a given
 // code point.
@@ -275 +277 @@
     }
     
-    void dump(PrintStream& out) const
+    void dumpInContext(PrintStream& out, DumpContext* context) const
     {
         switch (technique()) {
         case AlreadyInJSStack:
             out.printf("-");
-            break;
+            return;
         case AlreadyInJSStackAsUnboxedInt32:
             out.printf("(int32)");
-            break;
+            return;
         case AlreadyInJSStackAsUnboxedCell:
             out.printf("(cell)");
-            break;
+            return;
         case AlreadyInJSStackAsUnboxedBoolean:
             out.printf("(bool)");
-            break;
+            return;
         case AlreadyInJSStackAsUnboxedDouble:
             out.printf("(double)");
-            break;
+            return;
         case InGPR:
             out.printf("%%r%d", gpr());
-            break;
+            return;
         case UnboxedInt32InGPR:
             out.printf("int32(%%r%d)", gpr());
-            break;
+            return;
         case UnboxedBooleanInGPR:
             out.printf("bool(%%r%d)", gpr());
-            break;
+            return;
         case UInt32InGPR:
             out.printf("uint32(%%r%d)", gpr());
-            break;
+            return;
         case InFPR:
             out.printf("%%fr%d", fpr());
-            break;
+            return;
 #if USE(JSVALUE32_64)
         case InPair:
             out.printf("pair(%%r%d, %%r%d)", tagGPR(), payloadGPR());
-            break;
+            return;
 #endif
         case DisplacedInJSStack:
             out.printf("*%d", virtualRegister());
-            break;
+            return;
         case Int32DisplacedInJSStack:
             out.printf("*int32(%d)", virtualRegister());
-            break;
+            return;
         case DoubleDisplacedInJSStack:
             out.printf("*double(%d)", virtualRegister());
-            break;
+            return;
         case CellDisplacedInJSStack:
             out.printf("*cell(%d)", virtualRegister());
-            break;
+            return;
         case BooleanDisplacedInJSStack:
             out.printf("*bool(%d)", virtualRegister());
-            break;
+            return;
         case ArgumentsThatWereNotCreated:
             out.printf("arguments");
-            break;
+            return;
         case Constant:
-            out.print("[", constant(), "]");
-            break;
+            out.print("[", inContext(constant(), context), "]");
+            return;
         case DontKnow:
             out.printf("!");
-            break;
-        default:
-            out.printf("?%d", technique());
-            break;
+            return;
         }
+        RELEASE_ASSERT_NOT_REACHED();
+    }
+    
+    void dump(PrintStream& out) const
+    {
+        dumpInContext(out, 0);
     }