start register allocator again, fix typo

[libfirm] / ir / be / scripts / generate_emitter.pl

diff --git a/ir/be/scripts/generate_emitter.pl b/ir/be/scripts/generate_emitter.pl
index 2262bda..7edb847 100755 (executable)
--- a/ir/be/scripts/generate_emitter.pl
+++ b/ir/be/scripts/generate_emitter.pl
@@ -14,6 +14,7 @@ my $target_dir = $ARGV[1];
 
 our $arch;
 our $comment_string;
+our $comment_string_end;
 our %nodes;
 
 # include spec file
@@ -28,6 +29,8 @@ unless ($return = do $specfile) {
 }
 use strict "subs";
 
+my $comment_string_quoted = quotemeta($comment_string);
+
 my $target_c = $target_dir."/gen_".$arch."_emitter.c";
 my $target_h = $target_dir."/gen_".$arch."_emitter.h";
 
@@ -62,7 +65,8 @@ foreach my $op (keys(%nodes)) {
                        my $cnt = 0;
                        my $buf = 'cmd_buf';
 
-                       foreach $template (split(/$comment_string/, $fmt, 2)) {
+                       push(@obst_func, $indent."cmnt_buf[0] = '\\0';\n");
+                       foreach $template (split(/$comment_string_quoted/, $fmt, 2)) {
                                my @params;
                                my $res = "";
                                $cnt++;
@@ -76,27 +80,34 @@ foreach my $op (keys(%nodes)) {
                                }
 
                                # substitute all format parameter
-                               while ($template =~ /\%([ASD])(\d)|\%([COM])|\%(\w+)/) {
+                               while ($template =~ /(\%\%)|\%([ASDX])(\d)|\%([COM])|\%(\w+)/) {
                                        $res  .= $`;      # get everything before the match
 
-                                       if ($1 && $1 eq "S") {
+                                       if ($1) {
+                                               $res .= "%%";
+                                       }
+                                       elsif ($2 && $2 eq "S") {
+                                               push(@params, "n");
+                                               $res .= "%".$3."S"; # substitute %Sx with %xS
+                                       }
+                                       elsif ($2 && $2 eq "D") {
                                                push(@params, "n");
-                                               $res .= "%".$2."S"; # substitute %Sx with %xS
+                                               $res .= "%".$3."D"; # substitute %Dx with %xD
                                        }
-                                       elsif ($1 && $1 eq "D") {
+                                       elsif ($2 && $2 eq "X") {
                                                push(@params, "n");
-                                               $res .= "%".$2."D"; # substitute %Dx with %xD
+                                               $res .= "%".$3."X"; # substitute %Xx with %xX
                                        }
-                                       elsif ($1 && $1 eq "A") {
-                                               push(@params, "get_irn_n(n, ".($2 - 1).")");
+                                       elsif ($2 && $2 eq "A") {
+                                               push(@params, "get_irn_n(n, ".($3 - 1).")");
                                                $res .= "%+F";
                                        }
-                                       elsif ($3) {
+                                       elsif ($4) {
                                                push(@params, "n");
-                                               $res .= "%".$3;
+                                               $res .= "%".$4;
                                        }
-                                       elsif ($4) {  # backend provided function to call, has to return a string
-                                               push(@params, $4."(n, env)");
+                                       elsif ($5) {  # backend provided function to call, has to return a string
+                                               push(@params, $5."(n, env)");
                                                $res .= "\%s";
                                        }
 
@@ -109,13 +120,13 @@ foreach my $op (keys(%nodes)) {
 
                                push(@obst_func, $indent.'lc_esnprintf(arg_env, '.$buf.', 256, "'.$res.'"'.$parm.');'."\n");
                        }
+                       push(@obst_func, $indent.'lc_efprintf(arg_env, F, "\t%-35s %-60s '.$comment_string.' %+F (%+G) '.$comment_string_end.'\n", cmd_buf, cmnt_buf, n, n);'."\n");
                }
                else {
                        push(@obst_func, $template,"\n");
                }
        }
 
-       push(@obst_func, '  lc_efprintf(arg_env, F, "\t%-35s %-60s /* %+F */\n", cmd_buf, cmnt_buf, n);'."\n");
        push(@obst_func, "}\n\n");
 }