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

Timestamp:

Jul 13, 2012, 5:44:47 PM (13 years ago)

Author:

[email protected]

Message:

OfflineASM Pretty printing and commenting enhancements.
​https://bugs.webkit.org/show_bug.cgi?id=91281

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

Added some minor pretty printing in the OfflineASM.
Also added infrastruture for adding multiple types of comments and
annotations with the ability to enable/disable them in the generated
output as desired.

• GNUmakefile.list.am: add new file config.rb.
• llint/LLIntOfflineAsmConfig.h: Added OFFLINE_ASM_BEGIN, OFFLINE_ASM_END, and OFFLINE_ASM_LOCAL_LABEL macros. This will allow us to redefine these for other backends later.
• llint/LowLevelInterpreter32_64.asm: Add a small example of instruction annotations for now.
• llint/LowLevelInterpreter64.asm: Add a small example of instruction annotations for now.
• offlineasm/armv7.rb: Added handling of annotations.
• offlineasm/asm.rb: Added machinery to dump the new comments and annotations. Also added some indentations to make the output a little prettier.
• offlineasm/ast.rb: Added annotation field in class Instruction.
• offlineasm/backends.rb:
• offlineasm/config.rb: Added. Currently only contains commenting options. This file is meant to be a centralized place for build config values much like config.h for JavaScriptCore.
• offlineasm/generate_offset_extractor.rb:
• offlineasm/instructions.rb:
• offlineasm/offsets.rb:
• offlineasm/opt.rb:
• offlineasm/parser.rb: Parse and record annotations.
• offlineasm/registers.rb:
• offlineasm/self_hash.rb:
• offlineasm/settings.rb:
• offlineasm/transform.rb:
• offlineasm/x86.rb: Added handling of annotations.

File:

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

trunk/Source/JavaScriptCore/offlineasm/parser.rb

@@ -22 +22 @@
 # THE POSSIBILITY OF SUCH DAMAGE.
 
+require "config"
 require "ast"
 require "instructions"
@@ -82 +83 @@
     result = []
     lineNumber = 1
+    annotation = nil
     while not str.empty?
         case str
         when /\A\#([^\n]*)/
             # comment, ignore
+        when /\A\/\/([^\n]*)/
+            # annotation
+            annotation = $1
         when /\A\n/
+            # We've found a '\n'.  Emit the last comment recorded if appropriate:
+            if $enableInstrAnnotations and annotation
+                result << Token.new(CodeOrigin.new(fileName, lineNumber), "@" + annotation)
+                annotation = nil
+            end
             result << Token.new(CodeOrigin.new(fileName, lineNumber), $&)
             lineNumber += 1
@@ -137 +147 @@
 end
 
+def isAnnotation(token)
+    token =~ /\A\@([^\n]*)/
+end
+
 def isLabel(token)
     token =~ /\A_([a-zA-Z0-9_]*)\Z/
@@ -536 +550 @@
                     list << Instruction.new(codeOrigin, name, [])
                     break
+                elsif isAnnotation @tokens[@idx]
+                    annotation = @tokens[@idx].string
+                    list << Instruction.new(codeOrigin, name, [], annotation)
+                    @idx += 2 # Consume the newline as well.
                 elsif @tokens[@idx] == "\n"
                     # Zero operand instruction.
@@ -544 +562 @@
                     operands = []
                     endOfSequence = false
+                    annotation = nil
                     loop {
                         operands << parseOperand("while inside of instruction #{name}")
@@ -553 +572 @@
                             # Has another operand.
                             @idx += 1
+                        elsif isAnnotation @tokens[@idx]
+                            annotation = @tokens[@idx].string
+                            @idx += 2 # Consume the newline as well.
+                            break
                         elsif @tokens[@idx] == "\n"
                             # The end of the instruction.
@@ -561 +584 @@
                         end
                     }
-                    list << Instruction.new(codeOrigin, name, operands)
+                    list << Instruction.new(codeOrigin, name, operands, annotation)
                     if endOfSequence
                         break