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

Timestamp:

Feb 25, 2012, 4:19:07 PM (13 years ago)

Author:

[email protected]

Message:

LLInt assembly file should be split into 32-bit and 64-bit parts
​https://bugs.webkit.org/show_bug.cgi?id=79584

Reviewed by Sam Weinig.

Moved LowLevelInterpreter.asm to LowLevelInterpreter32_64.asm. Gave offlineasm
the ability to include files, and correctly track dependencies: it restricts
the include mechanism to using the same directory as the source file, and uses
the SHA1 hash of all .asm files in that directory as an input hash.

• llint/LLIntOfflineAsmConfig.h:
• llint/LowLevelInterpreter.asm:
• llint/LowLevelInterpreter32_64.asm: Added.
  • This is just the entire contents of what was previously LowLevelInterpreter.asm
• llint/LowLevelInterpreter64.asm: Added.
• offlineasm/asm.rb:
• offlineasm/ast.rb:
• offlineasm/generate_offset_extractor.rb:
• offlineasm/parser.rb:
• offlineasm/self_hash.rb:

File:

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

trunk/Source/JavaScriptCore/offlineasm/parser.rb

@@ -24 +24 @@
 require "ast"
 require "instructions"
+require "pathname"
 require "registers"
+require "self_hash"
+
+class CodeOrigin
+    attr_reader :fileName, :lineNumber
+    
+    def initialize(fileName, lineNumber)
+        @fileName = fileName
+        @lineNumber = lineNumber
+    end
+    
+    def to_s
+        "#{fileName}:#{lineNumber}"
+    end
+end
 
 class Token
@@ -47 +62 @@
     
     def to_s
-        "#{@string.inspect} at line #{codeOrigin}"
+        "#{@string.inspect} at #{codeOrigin}"
     end
     
@@ -63 +78 @@
 #
 
-def lex(str)
+def lex(str, fileName)
+    fileName = Pathname.new(fileName)
     result = []
     lineNumber = 1
@@ -71 +87 @@
             # comment, ignore
         when /\A\n/
-            result << Token.new(lineNumber, $&)
+            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
             lineNumber += 1
         when /\A[a-zA-Z]([a-zA-Z0-9_]*)/
-            result << Token.new(lineNumber, $&)
+            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
         when /\A\.([a-zA-Z0-9_]*)/
-            result << Token.new(lineNumber, $&)
+            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
         when /\A_([a-zA-Z0-9_]*)/
-            result << Token.new(lineNumber, $&)
+            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
         when /\A([ \t]+)/
             # whitespace, ignore
         when /\A0x([0-9a-fA-F]+)/
-            result << Token.new(lineNumber, $&.hex.to_s)
+            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&.hex.to_s)
         when /\A0([0-7]+)/
-            result << Token.new(lineNumber, $&.oct.to_s)
+            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&.oct.to_s)
         when /\A([0-9]+)/
-            result << Token.new(lineNumber, $&)
+            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
         when /\A::/
-            result << Token.new(lineNumber, $&)
+            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
         when /\A[:,\(\)\[\]=\+\-*]/
-            result << Token.new(lineNumber, $&)
-        else
-            raise "Lexer error at line number #{lineNumber}, unexpected sequence #{str[0..20].inspect}"
+            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
+        else
+            raise "Lexer error at #{CodeOrigin.new(fileName, lineNumber).to_s}, unexpected sequence #{str[0..20].inspect}"
         end
         str = $~.post_match
@@ -112 +128 @@
 
 def isKeyword(token)
-    token =~ /\A((true)|(false)|(if)|(then)|(else)|(elsif)|(end)|(and)|(or)|(not)|(macro)|(const)|(sizeof)|(error))\Z/ or
+    token =~ /\A((true)|(false)|(if)|(then)|(else)|(elsif)|(end)|(and)|(or)|(not)|(macro)|(const)|(sizeof)|(error)|(include))\Z/ or
         token =~ REGISTER_PATTERN or
         token =~ INSTRUCTION_PATTERN
@@ -143 +159 @@
 
 class Parser
-    def initialize(tokens)
-        @tokens = tokens
+    def initialize(data, fileName)
+        @tokens = lex(data, fileName)
         @idx = 0
     end
@@ -572 +588 @@
                 end
                 @idx += 1
+            elsif @tokens[@idx] == "include"
+                @idx += 1
+                parseError unless isIdentifier(@tokens[@idx])
+                moduleName = @tokens[@idx].string
+                fileName = @tokens[@idx].codeOrigin.fileName.dirname + (moduleName + ".asm")
+                @idx += 1
+                $stderr.puts "offlineasm: Including file #{fileName}"
+                list << parse(fileName)
             else
                 parseError "Expecting terminal #{final} #{comment}"
@@ -580 +604 @@
 end
 
-def parse(tokens)
-    parser = Parser.new(tokens)
+def parseData(data, fileName)
+    parser = Parser.new(data, fileName)
     parser.parseSequence(nil, "")
 end
 
+def parse(fileName)
+    parseData(IO::read(fileName), fileName)
+end
+
+def parseHash(fileName)
+    dirHash(Pathname.new(fileName).dirname, /\.asm$/)
+end
+