another fix :)

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

diff --git a/ir/be/scripts/generate_emitter.pl b/ir/be/scripts/generate_emitter.pl
index 614e64d..1326d9a 100755 (executable)
--- a/ir/be/scripts/generate_emitter.pl
+++ b/ir/be/scripts/generate_emitter.pl
@@ -8,12 +8,17 @@
 
 use strict;
 use Data::Dumper;
+use File::Basename;
 
-my $specfile   = $ARGV[0];
-my $target_dir = $ARGV[1];
+my $myname = $0;
+our $specfile   = $ARGV[0];
+our $target_dir = $ARGV[1];
 
 our $arch;
+our $comment_string = "/*";
+our $comment_string_end = "*/" ;
 our %nodes;
+our $new_emit_syntax = 0;
 
 # include spec file
 
@@ -27,6 +32,18 @@ unless ($return = do $specfile) {
 }
 use strict "subs";
 
+if ($new_emit_syntax) {
+       my $newscript = dirname($myname) . "/generate_emitter_new.pl";
+       unless ($return = do "$newscript") {
+               warn "couldn't parse $newscript: $@" if $@;
+               warn "couldn't do $newscript: $!"    unless defined $return;
+               warn "couldn't run $newscript"       unless $return;
+       }
+       exit;
+}
+
+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";
 
@@ -39,63 +56,97 @@ foreach my $op (keys(%nodes)) {
        my %n = %{ $nodes{"$op"} };
 
        # skip this node description if no emit information is available
-       next if (!$n{"emit"} || length($n{"emit"}) < 1);
+       next if (!defined($n{"emit"}));
 
-       $line = "static void emit_".$arch."_".$op."(const ir_node *n, emit_env_t *env)";
-       push(@obst_func, $line." {\n  FILE *F = env->out;\n");
-       $line = "  BE_EMIT($op);\n";
-       push(@obst_register, $line);
+       $line = "static void emit_".$arch."_".$op."(const ir_node *n, $arch\_emit_env_t *env)";
 
+       push(@obst_register, "  BE_EMIT($op);\n");
+
+       if($n{"emit"} eq "") {
+               push(@obst_func, $line." {\n");
+               push(@obst_func, "}\n\n");
+               next;
+       }
+
+       push(@obst_func, $line." {\n  FILE *F = env->out;\n");
+       push(@obst_func, "  char cmd_buf[256], cmnt_buf[256];\n");
+       push(@obst_func, "  const lc_arg_env_t *arg_env = $arch\_get_arg_env();\n\n");
        my @emit = split(/\n/, $n{"emit"});
 
        foreach my $template (@emit) {
                # substitute only lines, starting with a '.'
                if ($template =~ /^(\d*)\.\s*/) {
-                       my @params;
-                       my $res    = "";
                        my $indent = "  "; # default indent is 2 spaces
 
                        $indent = " " x $1 if ($1 && $1 > 0);
                        # remove indent, dot and trailing spaces
                        $template =~ s/^\d*\.\s*//;
-                       # substitute all format parameter
-                       while ($template =~ /\%([ASD])(\d)|\%([COM])|\%(\w+)/) {
-                               $res  .= $`;      # get everything before the match
-
-                               if ($1 && $1 eq "S") {
-                                       push(@params, "n");
-                                       $res .= "%".$2."S"; # substitute %Sx with %xS
-                               }
-                               elsif ($1 && $1 eq "D") {
-                                       push(@params, "n");
-                                       $res .= "%".$2."D"; # substitute %Dx with %xD
-                               }
-                               elsif ($1 && $1 eq "A") {
-                                       push(@params, "get_irn_n(n, ".($2 - 1).")");
-                                       $res .= "%+F";
-                               }
-                               elsif ($3) {
-                                       push(@params, "n");
-                                       $res .= "%".$3;
-                               }
-                               elsif ($4) {  # backend provided function to call, has to return a string
-                                       push(@params, $4."(n)");
-                                       $res .= "\%s";
+                       my $fmt = $template;
+                       my $cnt = 0;
+                       my $buf = 'cmd_buf';
+
+                       push(@obst_func, $indent."cmnt_buf[0] = '\\0';\n");
+                       foreach $template (split(/$comment_string_quoted/, $fmt, 2)) {
+                               my @params;
+                               my $res = "";
+                               $cnt++;
+
+                               $template =~ s/(\\t)*$//;
+
+                               if ($cnt == 2) {
+                                       # add the comment begin string
+                                       $res .= $comment_string;
+                                       $buf  = "cmnt_buf";
                                }
 
-                               $template = $'; # scan everything after the match
-                       }
-                       $res  .= $template; # get the remaining string
+                               # substitute all format parameter
+                               while ($template =~ /(\%\%)|\%([ASDX])(\d)|\%([COM])|\%(\w+)/) {
+                                       $res  .= $`;      # get everything before the match
+
+                                       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 .= "%".$3."D"; # substitute %Dx with %xD
+                                       }
+                                       elsif ($2 && $2 eq "X") {
+                                               push(@params, "n");
+                                               $res .= "%".$3."X"; # substitute %Xx with %xX
+                                       }
+                                       elsif ($2 && $2 eq "A") {
+                                               push(@params, "get_irn_n(n, ".($3 - 1).")");
+                                               $res .= "%+F";
+                                       }
+                                       elsif ($4) {
+                                               push(@params, "n");
+                                               $res .= "%".$4;
+                                       }
+                                       elsif ($5) {  # backend provided function to call, has to return a string
+                                               push(@params, $5."(n, env)");
+                                               $res .= "\%s";
+                                       }
+
+                                       $template = $'; # scan everything after the match
+                               }
+                               $res .= $template; # get the remaining string
 
-                       my $parm = "";
-                       $parm = ", ".join(", ", @params) if (@params);
+                               my $parm = "";
+                               $parm = ", ".join(", ", @params) if (@params);
 
-                       push(@obst_func, $indent.'lc_efprintf('.$arch.'_get_arg_env(), F, "\t'.$res.'\n"'.$parm.');'."\n");
+                               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, "}\n\n");
 }