Title: [157937] trunk/Source/_javascript_Core
Revision
157937
Author
[email protected]
Date
2013-10-24 10:05:57 -0700 (Thu, 24 Oct 2013)

Log Message

Better way to fix part of broken C Loop LLINT build.
https://bugs.webkit.org/show_bug.cgi?id=123271.

Reviewed by Geoffrey Garen.

Undoing offline asm hackery.

* llint/LowLevelInterpreter.cpp:
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:
* offlineasm/cloop.rb:
* offlineasm/instructions.rb:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (157936 => 157937)


--- trunk/Source/_javascript_Core/ChangeLog	2013-10-24 17:05:36 UTC (rev 157936)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-10-24 17:05:57 UTC (rev 157937)
@@ -1,5 +1,20 @@
 2013-10-24  Mark Lam  <[email protected]>
 
+        Better way to fix part of broken C Loop LLINT build.
+        https://bugs.webkit.org/show_bug.cgi?id=123271.
+
+        Reviewed by Geoffrey Garen.
+
+        Undoing offline asm hackery.
+
+        * llint/LowLevelInterpreter.cpp:
+        * llint/LowLevelInterpreter32_64.asm:
+        * llint/LowLevelInterpreter64.asm:
+        * offlineasm/cloop.rb:
+        * offlineasm/instructions.rb:
+
+2013-10-24  Mark Lam  <[email protected]>
+
         Fix broken C Loop LLINT build.
         https://bugs.webkit.org/show_bug.cgi?id=123271.
 

Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter.cpp (157936 => 157937)


--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter.cpp	2013-10-24 17:05:36 UTC (rev 157936)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter.cpp	2013-10-24 17:05:57 UTC (rev 157937)
@@ -98,7 +98,10 @@
     #define OFFLINE_ASM_GLUE_LABEL(label)  case label: label:
 #endif
 
-#define OFFLINE_ASM_LOCAL_LABEL(label)   label:
+#define OFFLINE_ASM_LOCAL_LABEL(label) \
+    label: \
+        if (false) \
+            goto label;
 
 
 //============================================================================

Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm (157936 => 157937)


--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm	2013-10-24 17:05:36 UTC (rev 157936)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm	2013-10-24 17:05:57 UTC (rev 157937)
@@ -1389,9 +1389,6 @@
 
 _llint_op_put_by_val_direct:
     putByVal(macro(addr, slowPath)
-        if C_LOOP
-            cloopUnusedLabel slowPath
-        end
     end, _llint_slow_path_put_by_val_direct)
 
 _llint_op_jmp:

Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm (157936 => 157937)


--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm	2013-10-24 17:05:36 UTC (rev 157936)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm	2013-10-24 17:05:57 UTC (rev 157937)
@@ -1248,9 +1248,6 @@
 
 _llint_op_put_by_val_direct:
     putByVal(macro(slot, slowPath)
-        if C_LOOP
-            cloopUnusedLabel slowPath
-        end
     end, _llint_slow_path_put_by_val_direct)
 
 

Modified: trunk/Source/_javascript_Core/offlineasm/cloop.rb (157936 => 157937)


--- trunk/Source/_javascript_Core/offlineasm/cloop.rb	2013-10-24 17:05:36 UTC (rev 157936)
+++ trunk/Source/_javascript_Core/offlineasm/cloop.rb	2013-10-24 17:05:57 UTC (rev 157937)
@@ -1110,9 +1110,6 @@
         when "cloopCallSlowPath"
             cloopEmitCallSlowPath(operands)
 
-        when "cloopUnusedLabel"
-            $asm.putc "if (false) goto #{operands[0].cLabel};"
-
         # For debugging only. This is used to insert instrumentation into the
         # generated LLIntAssembly.h during llint development only. Do not use
         # for production code.

Modified: trunk/Source/_javascript_Core/offlineasm/instructions.rb (157936 => 157937)


--- trunk/Source/_javascript_Core/offlineasm/instructions.rb	2013-10-24 17:05:36 UTC (rev 157936)
+++ trunk/Source/_javascript_Core/offlineasm/instructions.rb	2013-10-24 17:05:57 UTC (rev 157937)
@@ -295,7 +295,6 @@
      "cloopCallJSFunction",  # operands: callee
      "cloopCallNative",      # operands: callee
      "cloopCallSlowPath",    # operands: callTarget, currentFrame, currentPC
-     "cloopUnusedLabel",     # operands: label
 
      # For debugging only:
      # Takes no operands but simply emits whatever follows in // comments as
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to