Changeset 110383 in webkit for trunk/Source/JavaScriptCore/offlineasm/parser.rb

Timestamp:

Mar 10, 2012, 4:33:20 PM (13 years ago)

Author:

[email protected]

Message:

LLInt should support JSVALUE64
​https://bugs.webkit.org/show_bug.cgi?id=79609
<rdar://problem/10063437>

Reviewed by Gavin Barraclough and Oliver Hunt.

Ported the LLInt, which previously only worked on 32-bit, to 64-bit. This
patch moves a fair bit of code from LowLevelInterpreter32_64.asm to the common
file, LowLevelInterpreter.asm. About 1/3 of the LLInt did not have to be
specialized for value representation.

Also made some minor changes to offlineasm and the slow-paths.

• llint/LLIntData.cpp:

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

• llint/LLIntEntrypoints.cpp:
• llint/LLIntSlowPaths.cpp:

(LLInt):
(JSC::LLInt::llint_trace_value):
(JSC::LLInt::LLINT_SLOW_PATH_DECL):
(JSC::LLInt::jitCompileAndSetHeuristics):

• llint/LLIntSlowPaths.h:

(LLInt):
(SlowPathReturnType):
(JSC::LLInt::SlowPathReturnType::SlowPathReturnType):
(JSC::LLInt::encodeResult):

• llint/LLIntThunks.cpp:
• llint/LowLevelInterpreter.asm:
• llint/LowLevelInterpreter32_64.asm:
• llint/LowLevelInterpreter64.asm:
• offlineasm/armv7.rb:
• offlineasm/asm.rb:
• offlineasm/ast.rb:
• offlineasm/backends.rb:
• offlineasm/instructions.rb:
• offlineasm/parser.rb:
• offlineasm/registers.rb:
• offlineasm/transform.rb:
• offlineasm/x86.rb:
• wtf/Platform.h:

File:

• trunk/Source/JavaScriptCore/offlineasm/parser.rb (modified) (4 diffs)

trunk/Source/JavaScriptCore/offlineasm/parser.rb

@@ -105 +105 @@
         when /\A::/
             result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
-        when /\A[:,\(\)\[\]=\+\-*]/
+        when /\A[:,\(\)\[\]=\+\-~\|&^*]/
             result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
         else
@@ -323 +323 @@
             @idx += 1
             NegImmediate.new(@tokens[@idx - 1].codeOrigin, parseExpressionAtom)
+        elsif @tokens[@idx] == "~"
+            @idx += 1
+            BitnotImmediate.new(@tokens[@idx - 1].codeOrigin, parseExpressionAtom)
         elsif @tokens[@idx] == "("
             @idx += 1
@@ -366 +369 @@
     
     def couldBeExpression
-        @tokens[@idx] == "-" or @tokens[@idx] == "sizeof" or isInteger(@tokens[@idx]) or isVariable(@tokens[@idx]) or @tokens[@idx] == "("
-    end
-    
-    def parseExpression
+        @tokens[@idx] == "-" or @tokens[@idx] == "~" or @tokens[@idx] == "sizeof" or isInteger(@tokens[@idx]) or isVariable(@tokens[@idx]) or @tokens[@idx] == "("
+    end
+    
+    def parseExpressionAdd
         skipNewLine
         result = parseExpressionMul
@@ -379 +382 @@
                 @idx += 1
                 result = SubImmediates.new(@tokens[@idx - 1].codeOrigin, result, parseExpressionMul)
+            else
+                raise
+            end
+        end
+        result
+    end
+    
+    def parseExpressionAnd
+        skipNewLine
+        result = parseExpressionAdd
+        while @tokens[@idx] == "&"
+            @idx += 1
+            result = AndImmediates.new(@tokens[@idx - 1].codeOrigin, result, parseExpressionAdd)
+        end
+        result
+    end
+    
+    def parseExpression
+        skipNewLine
+        result = parseExpressionAnd
+        while @tokens[@idx] == "|" or @tokens[@idx] == "^"
+            if @tokens[@idx] == "|"
+                @idx += 1
+                result = OrImmediates.new(@tokens[@idx - 1].codeOrigin, result, parseExpressionAnd)
+            elsif @tokens[@idx] == "^"
+                @idx += 1
+                result = XorImmediates.new(@tokens[@idx - 1].codeOrigin, result, parseExpressionAnd)
             else
                 raise