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

Timestamp:

Feb 12, 2016, 6:37:19 PM (9 years ago)

Author:

[email protected]

Message:

offlineasm: Emit Dwarf2 file and location directives to allow for debugging .asm files
​https://bugs.webkit.org/show_bug.cgi?id=152703

Reviewed by Mark Lam.

Added support to output Dwarf2 .file and .loc assembler directives to provide the debugging
information needed to correlate the offline assembler generated code with the source lines
in the .asm files.

Changed the tracking of file data to include a file index that was provided to the .file
directive. That index is used when emitting the .loc directives.

• offlineasm/arm.rb:
• offlineasm/arm64.rb:
• offlineasm/asm.rb:
• offlineasm/backends.rb:
• offlineasm/config.rb:
• offlineasm/parser.rb:
• offlineasm/x86.rb:

File:

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

trunk/Source/JavaScriptCore/offlineasm/parser.rb

@@ -1 @@
-# Copyright (C) 2011 Apple Inc. All rights reserved.
+# Copyright (C) 2011, 2016 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -29 +29 @@
 require "self_hash"
 
+class SourceFile
+    @@fileNames = []
+    
+    attr_reader :name, :fileNumber
+
+    def SourceFile.outputDotFileList(outp)
+        @@fileNames.each_index {
+            | index |
+            outp.puts "\".file #{index+1} \\\"#{@@fileNames[index]}\\\"\\n\""
+        }
+    end
+
+    def initialize(fileName)
+        @name = Pathname.new(fileName)
+        pathName = "#{@name.realpath}"
+        fileNumber = @@fileNames.index(pathName)
+        if not fileNumber
+            @@fileNames << pathName
+            fileNumber = @@fileNames.length
+        else
+            fileNumber += 1 # File numbers are 1 based
+        end
+        @fileNumber = fileNumber
+    end
+end
+
 class CodeOrigin
-    attr_reader :fileName, :lineNumber
-    
-    def initialize(fileName, lineNumber)
-        @fileName = fileName
+    attr_reader :lineNumber
+    
+    def initialize(sourceFile, lineNumber)
+        @sourceFile = sourceFile
         @lineNumber = lineNumber
     end
-    
+
+    def fileName
+        @sourceFile.name
+    end
+
+    def debugDirective
+        $emitWinAsm ? nil : "\".loc #{@sourceFile.fileNumber} #{lineNumber}\\n\""
+    end
+
     def to_s
         "#{fileName}:#{lineNumber}"
@@ -118 +152 @@
 #
 
-def lex(str, fileName)
-    fileName = Pathname.new(fileName)
+def lex(str, file)
     result = []
     lineNumber = 1
@@ -139 +172 @@
             # enableInstrAnnotations is not enabled.
             if annotation
-                result << Annotation.new(CodeOrigin.new(fileName, lineNumber),
+                result << Annotation.new(CodeOrigin.new(file, lineNumber),
                                          annotationType, annotation)
                 annotation = nil
             end
-            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
+            result << Token.new(CodeOrigin.new(file, lineNumber), $&)
             lineNumber += 1
         when /\A[a-zA-Z]([a-zA-Z0-9_.]*)/
-            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
+            result << Token.new(CodeOrigin.new(file, lineNumber), $&)
         when /\A\.([a-zA-Z0-9_]*)/
-            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
+            result << Token.new(CodeOrigin.new(file, lineNumber), $&)
         when /\A_([a-zA-Z0-9_]*)/
-            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
+            result << Token.new(CodeOrigin.new(file, lineNumber), $&)
         when /\A([ \t]+)/
             # whitespace, ignore
@@ -157 +190 @@
             next
         when /\A0x([0-9a-fA-F]+)/
-            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&.hex.to_s)
+            result << Token.new(CodeOrigin.new(file, lineNumber), $&.hex.to_s)
         when /\A0([0-7]+)/
-            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&.oct.to_s)
+            result << Token.new(CodeOrigin.new(file, lineNumber), $&.oct.to_s)
         when /\A([0-9]+)/
-            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
+            result << Token.new(CodeOrigin.new(file, lineNumber), $&)
         when /\A::/
-            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
+            result << Token.new(CodeOrigin.new(file, lineNumber), $&)
         when /\A[:,\(\)\[\]=\+\-~\|&^*]/
-            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
+            result << Token.new(CodeOrigin.new(file, lineNumber), $&)
         when /\A".*"/
-            result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
-        else
-            raise "Lexer error at #{CodeOrigin.new(fileName, lineNumber).to_s}, unexpected sequence #{str[0..20].inspect}"
+            result << Token.new(CodeOrigin.new(file, lineNumber), $&)
+        else
+            raise "Lexer error at #{CodeOrigin.new(file, lineNumber).to_s}, unexpected sequence #{str[0..20].inspect}"
         end
         whitespaceFound = false
@@ -778 +811 @@
 
 def parseData(data, fileName)
-    parser = Parser.new(data, fileName)
+    parser = Parser.new(data, SourceFile.new(fileName))
     parser.parseSequence(nil, "")
 end
@@ -787 +820 @@
 
 def parseHash(fileName)
-    parser = Parser.new(IO::read(fileName), fileName)
+    parser = Parser.new(IO::read(fileName), SourceFile.new(fileName))
     fileList = parser.parseIncludes(nil, "")
     fileListHash(fileList)