Changeset 123147 in webkit for trunk/Source/JavaScriptCore/offlineasm/asm.rb

Timestamp:

Jul 19, 2012, 1:53:22 PM (13 years ago)

Author:

[email protected]

Message:

Bug fixes and enhancements for OfflineASM annotation system.
​https://bugs.webkit.org/show_bug.cgi?id=91690

Patch by Mark Lam <​[email protected]> on 2012-07-19
Reviewed by Filip Pizlo.

• offlineasm/armv7.rb: added default handling of Instruction lower().
• offlineasm/asm.rb: added more support for annotations and more pretty printing.
• offlineasm/ast.rb: added more support for annotations.
• offlineasm/config.rb: added $preferredCommentStartColumn, simplified $enableInstrAnnotations.
• offlineasm/parser.rb: added more support for annotations.
• offlineasm/transform.rb: added more support for annotations.
• offlineasm/x86.rb: added default handling of Instruction lower().

File:

• trunk/Source/JavaScriptCore/offlineasm/asm.rb (modified) (6 diffs)

trunk/Source/JavaScriptCore/offlineasm/asm.rb

@@ -46 +46 @@
         @numLocalLabels = 0
         @numGlobalLabels = 0
+
+        @newlineSpacerState = :none
     end
     
@@ -67 +69 @@
     # Concatenates all the various components of the comment to dump.
     def lastComment
+        separator = " "
         result = ""
-        result = " #{@comment} ." if @comment
-        result += " #{@annotation} ." if @annotation and $enableTrailingInstrAnnotations
-        result += " #{@internalComment} ." if @internalComment
-        result += " #{@codeOrigin} ." if @codeOrigin and $enableCodeOriginComments
+        result = "#{@comment}" if @comment
+        if @annotation and $enableInstrAnnotations
+            result += separator if result != ""
+            result += "#{@annotation}"
+        end
+        if @internalComment
+            result += separator if result != ""
+            result += "#{@internalComment}"
+        end
+        if @codeOrigin and $enableCodeOriginComments
+            result += separator if result != ""
+            result += "#{@codeOrigin}"
+        end
         if result != ""
-            result = "  //" + result
+            result = "// " + result
         end
 
@@ -79 +91 @@
         @commentState = :none
         @comment = nil
-        @internalComment = nil
         @annotation = nil
         @codeOrigin = nil
+        @internalComment = nil
         result
     end
     
-    # Dumps the current instruction annotation in interlaced mode if appropriate.
-    def putInterlacedAnnotation()
-        raise unless @state == :asm
-        if $enableInterlacedInstrAnnotations
-            @outp.puts("    // #{@annotation}") if @annotation
+    def formatDump(dumpStr, comment, commentColumns=$preferredCommentStartColumn)
+        if comment.length > 0
+            "%-#{commentColumns}s %s" % [dumpStr, comment]
+        else
+            dumpStr
+        end
+    end
+
+    # private method for internal use only.
+    def putAnnotation(text)
+        raise unless @state == :asm
+        if $enableInstrAnnotations
+            @outp.puts text
             @annotation = nil
         end
+    end
+
+    def putLocalAnnotation()
+        putAnnotation "    // #{@annotation}" if @annotation
+    end
+
+    def putGlobalAnnotation()
+        putsNewlineSpacerIfAppropriate(:annotation)
+        putAnnotation "// #{@annotation}" if @annotation
     end
 
@@ -103 +132 @@
     def puts(*line)
         raise unless @state == :asm
-        putInterlacedAnnotation
-        @outp.puts("    \"\\t" + line.join('') + "\\n\"#{lastComment}")
+        @outp.puts(formatDump("    \"\\t" + line.join('') + "\\n\"", lastComment))
     end
     
@@ -112 +140 @@
     end
     
+    def putsNewlineSpacerIfAppropriate(state)
+        if @newlineSpacerState != state
+            @outp.puts("\n")
+            @newlineSpacerState = state
+        end
+    end
+
     def putsLabel(labelName)
         raise unless @state == :asm
         @numGlobalLabels += 1
-        @outp.puts("\n")
+        putsNewlineSpacerIfAppropriate(:global)
         @internalComment = $enableLabelCountComments ? "Global Label #{@numGlobalLabels}" : nil
-        @outp.puts("OFFLINE_ASM_GLOBAL_LABEL(#{labelName})#{lastComment}")
+        @outp.puts(formatDump("OFFLINE_ASM_GLOBAL_LABEL(#{labelName})", lastComment))
+        @newlineSpacerState = :none # After a global label, we can use another spacer.
     end
     
@@ -125 +161 @@
         @outp.puts("\n")
         @internalComment = $enableLabelCountComments ? "Local Label #{@numLocalLabels}" : nil
-        @outp.puts("OFFLINE_ASM_LOCAL_LABEL(#{labelName})#{lastComment}")
+        @outp.puts(formatDump("  OFFLINE_ASM_LOCAL_LABEL(#{labelName})", lastComment))
     end