Changeset 229506 in webkit

Timestamp:

Mar 10, 2018, 12:13:03 PM (7 years ago)

Author:

mark.lam@apple.com

Message:

offlineasm should reset the Assembler's working state before doing another pass for a new target.
​https://bugs.webkit.org/show_bug.cgi?id=183538
<rdar://problem/38325955>

Reviewed by Michael Saboff.

• llint/LowLevelInterpreter.cpp:
• offlineasm/asm.rb:
• offlineasm/cloop.rb:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• llint/LowLevelInterpreter.cpp (modified) (1 diff)
• offlineasm/asm.rb (modified) (2 diffs)
• offlineasm/cloop.rb (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-03-09  Mark Lam  <mark.lam@apple.com>
+
+        offlineasm should reset the Assembler's working state before doing another pass for a new target.
+        https://bugs.webkit.org/show_bug.cgi?id=183538
+        <rdar://problem/38325955>
+
+        Reviewed by Michael Saboff.
+
+        * llint/LowLevelInterpreter.cpp:
+        * offlineasm/asm.rb:
+        * offlineasm/cloop.rb:
+
 2018-03-09  Brian Burg  <bburg@apple.com>
 

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp

@@ -31 +31 @@
 
 #if !ENABLE(JIT)
+#include "Bytecodes.h"
 #include "CLoopStackInlines.h"
 #include "CodeBlock.h"

trunk/Source/JavaScriptCore/offlineasm/asm.rb

@@ -40 +40 @@
         @outp = outp
         @state = :cpp
+        resetAsm
+    end
+
+    def resetAsm
         @commentState = :none
         @comment = nil
@@ -94 +98 @@
     
     def inAsm
+        resetAsm
         enterAsm
         yield

trunk/Source/JavaScriptCore/offlineasm/cloop.rb

@@ -520 +520 @@
 
 class Instruction
-    @@didReturnFromJSLabelCounter = 0
-
     def lowerC_LOOP
         case opcode
@@ -1079 +1077 @@
         # as an opcode dispatch.
         when "cloopCallJSFunction"
-            @@didReturnFromJSLabelCounter += 1
-            $asm.putc "lr.opcode = getOpcode(llint_cloop_did_return_from_js_#{@@didReturnFromJSLabelCounter});"
+            uid = $asm.newUID
+            $asm.putc "lr.opcode = getOpcode(llint_cloop_did_return_from_js_#{uid});"
             $asm.putc "opcode = #{operands[0].clValue(:opcode)};"
             $asm.putc "DISPATCH_OPCODE();"
-            $asm.putsLabel("llint_cloop_did_return_from_js_#{@@didReturnFromJSLabelCounter}", false)
+            $asm.putsLabel("llint_cloop_did_return_from_js_#{uid}", false)
 
         # We can't do generic function calls with an arbitrary set of args, but