fixed some minor bugs

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

diff --git a/ir/be/scripts/generate_new_opcodes.pl b/ir/be/scripts/generate_new_opcodes.pl
index 179b396..763af88 100755 (executable)
--- a/ir/be/scripts/generate_new_opcodes.pl
+++ b/ir/be/scripts/generate_new_opcodes.pl
@@ -71,6 +71,7 @@ foreach my $op (keys(%nodes)) {
 
        push(@obst_is_archirn, "is_$op(node)");
 
+       push(@obst_header, "extern ir_op *op_$op;\n");
        push(@obst_header, "ir_op *get_op_$op(void);\n");
        push(@obst_header, "int is_$op(const ir_node *n);\n");
 
@@ -131,9 +132,10 @@ foreach my $op (keys(%nodes)) {
                                print "DEFAULT rd_constructor requires numeric arity! Ignoring op $orig_op!\n";
                                next;
                        }
-                       $temp  = "  $arch\_attr_t *attr;\n";
-                       $temp .= "  ir_node *res;\n";
+
+                       $temp  = "  ir_node *res;\n";
                        $temp .= "  ir_node *in[$arity];\n" if ($arity > 0);
+                       $temp .= "  int flags = 0;\n";
 
                        undef my $in_req_var;
                        undef my $out_req_var;
@@ -181,23 +183,22 @@ foreach my $op (keys(%nodes)) {
                        $temp .= "  irn_vrfy_irg(res, irg);\n\n";
 
                        # set flags
-                       $temp .= "  attr = get_$arch\_attr(res);\n\n";
-                       $temp .= "  attr->flags  = 0;                                 /* clear flags */\n";
-
                        if (exists($n{"irn_flags"})) {
                                foreach my $flag (split(/\|/, $n{"irn_flags"})) {
                                        if ($flag eq "R") {
-                                               $temp .= "  attr->flags |= arch_irn_flags_rematerializable;   /* op can be easily recalulated */\n";
+                                               $temp .= "  flags |= arch_irn_flags_rematerializable;   /* op can be easily recalulated */\n";
                                        }
                                        elsif ($flag eq "N") {
-                                               $temp .= "  attr->flags |= arch_irn_flags_dont_spill;         /* op is NOT spillable */\n";
+                                               $temp .= "  flags |= arch_irn_flags_dont_spill;         /* op is NOT spillable */\n";
                                        }
                                        elsif ($flag eq "I") {
-                                               $temp .= "  attr->flags |= arch_irn_flags_ignore;             /* ignore op for register allocation */\n";
+                                               $temp .= "  flags |= arch_irn_flags_ignore;             /* ignore op for register allocation */\n";
                                        }
                                }
                        }
 
+                       my $in_param;
+                       my $out_param;
                        # allocate memory and set pointer to register requirements
                        if (exists($n{"reg_req"})) {
                                my %req = %{ $n{"reg_req"} };
@@ -207,26 +208,22 @@ foreach my $op (keys(%nodes)) {
                                undef my @out;
                                @out = @{ $req{"out"} } if exists(($req{"out"}));
 
-                               $temp .= "\n  /* set IN register requirements */\n";
                                if (@in) {
-                                       $temp .= "  attr->in_req  = ".$in_req_var.";\n";
+                                       $in_param = $in_req_var;
                                }
                                else {
-                                       $temp .= "  attr->in_req  = NULL;\n";
+                                       $in_param = "NULL";
                                }
 
-                               $temp .= "\n  /* set OUT register requirements and get space for registers */\n";
                                if (@out) {
-                                       $temp .= "  attr->out_req = ".$out_req_var.";\n";
-                                       $temp .= "  attr->slots   = xcalloc(".($#out + 1).", sizeof(attr->slots[0]));\n";
-                                       $temp .= "  attr->n_res   = ".($#out + 1).";\n";
+                                       $out_param = $out_req_var.", ".($#out + 1);
                                }
                                else {
-                                       $temp .= "  attr->out_req = NULL;\n";
-                                       $temp .= "  attr->slots   = NULL;\n";
-                                       $temp .= "  attr->n_res   = 0;\n";
+                                       $out_param = "NULL, 0";
                                }
                        }
+                       $temp .= "\n  /* init node attributes */\n";
+                       $temp .= "  init_$arch\_attributes(res, flags, $in_param, $out_param);\n";
 
                        $temp .= "\n  return res;\n";