$attr_type = $default_attr_type;
}
+ # determine hash function
+ my $hash_func;
+ if (exists($n{"hash_func"})) {
+ $hash_func = $n{"hash_func"};
+ }
+
# determine compare function
my $cmp_attr_func;
if (exists($n{"cmp_attr"})) {
my $complete_args = "";
$temp = "";
- $temp = "ir_node *new_rd_$op(dbg_info *db, ir_graph *irg, ir_node *block";
+ $temp = "ir_node *new_bd_$op(dbg_info *db, ir_node *block";
if (!exists($n{"args"})) { # default args
if ($arity == $ARITY_VARIABLE) {
$complete_args = ", int arity, ir_node *in[]";
$temp .= "\tflags |= arch_irn_flags_rematerializable;\n";
} elsif ($flag eq "N") {
$temp .= "\tflags |= arch_irn_flags_dont_spill;\n";
- } elsif ($flag eq "I") {
- $temp .= "\tflags |= arch_irn_flags_ignore;\n";
- } elsif ($flag eq "S") {
- $temp .= "\tflags |= arch_irn_flags_modify_sp;\n";
+ } else {
+ die "Fatal error: unknown flag $flag for ${op}\n";
}
}
$temp .= "\n";
$temp .= "\t/* create node */\n";
$temp .= "\tassert(op != NULL);\n";
- $temp .= "\tres = new_ir_node(db, irg, block, op, mode, arity, in);\n";
+ $temp .= "\tres = new_ir_node(db, current_ir_graph, block, op, mode, arity, in);\n";
$temp .= "\n";
$temp .= "\t/* init node attributes */\n";
}
$temp .= "\n";
- # set flags for outs
- if (exists($n{"outs"})) {
- undef my @outs;
- @outs = @{ $n{"outs"} };
-
- for (my $idx = 0; $idx <= $#outs; $idx++) {
- # check, if we have additional flags annotated to out
- if ($outs[$idx] =~ /:((S|I)(\|(S|I))*)/) {
- my $flag_string = $1;
- my $prefix = "";
- my $flags = "";
-
- foreach my $flag (split(/\|/, $flag_string)) {
- if ($flag eq "I") {
- $flags .= $prefix."arch_irn_flags_ignore";
- $prefix = " | ";
- } elsif ($flag eq "S") {
- $flags .= $prefix."arch_irn_flags_modify_sp";
- $prefix = " | ";
- }
- }
-
- $temp .= "\tset_$arch\_out_flags(res, $flags, $idx);\n";
- }
- }
- }
-
if (exists($n{"init_attr"})) {
$temp .= "\tattr = get_irn_generic_attr(res);\n";
$temp .= "\t".$n{"init_attr"}."\n";
$temp .= "\t/* optimize node */\n";
$temp .= "\tres = optimize_node(res);\n";
- $temp .= "\tirn_vrfy_irg(res, irg);\n";
+ $temp .= "\tirn_vrfy_irg(res, current_ir_graph);\n";
$temp .= "\n";
$temp .= "\treturn res;\n";
if (defined($copy_attr_func)) {
push(@obst_new_irop, "\tops.copy_attr = ${copy_attr_func};\n");
}
+ if (defined($hash_func)) {
+ push(@obst_new_irop, "\tops.hash = ${hash_func};\n");
+ }
$n_opcodes++;
my $n_res = $out_arity;
$temp = "\top_$op = new_ir_op(cur_opcode + iro_$op, \"$op\", op_pin_state_".$n{"state"}.", ".$n{"op_flags"};
$temp .= "|M, ".translate_arity($arity).", 0, sizeof(${attr_type}), &ops);\n";
push(@obst_new_irop, $temp);
- push(@obst_new_irop, "\tset_op_tag(op_$op, &$arch\_op_tag);\n");
+ push(@obst_new_irop, "\tset_op_tag(op_$op, $arch\_op_tag);\n");
if(defined($default_op_attr_type)) {
- push(@obst_new_irop, "\tattr = ($default_op_attr_type *) xmalloc(sizeof(attr[0]));\n");
- push(@obst_new_irop, "\tmemset(attr, 0, sizeof(attr[0]));\n");
+ push(@obst_new_irop, "\tattr = &attrs[iro_$op];\n");
if(defined($n{op_attr_init})) {
push(@obst_new_irop, "\t".$n{op_attr_init}."\n");
}
print OUT<<ENDOFISIRN;
/** A tag for the $arch opcodes. Note that the address is used as a tag value, NOT the FOURCC code. */
-static unsigned $arch\_op_tag = FOURCC('$a', '$b', '$c', '$d');
+#define $arch\_op_tag FOURCC('$a', '$b', '$c', '$d')
/** Return the opcode number of the first $arch opcode. */
int get_$arch\_opcode_first(void) {
/** Return 1 if the given opcode is a $arch machine op, 0 otherwise */
int is_$arch\_op(const ir_op *op) {
- return get_op_tag(op) == &$arch\_op_tag;
+ return get_op_tag(op) == $arch\_op_tag;
}
/** Return 1 if the given node is a $arch machine node, 0 otherwise */
#define K irop_flag_keep
#define M irop_flag_machine
#define O irop_flag_machine_op
+#define NB irop_flag_dump_noblock
+#define NI irop_flag_dump_noinput
#define R (irop_flag_user << 0)
ir_op_ops ops;
int cur_opcode;
static int run_once = 0;
- int i;
ENDOFMAIN
- if(defined($default_op_attr_type)) {
- print OUT "\t$default_op_attr_type *attr;\n";
+ if (defined($default_op_attr_type)) {
+ print OUT "\t$default_op_attr_type *attr, *attrs;\n";
}
print OUT<<ENDOFMAIN;
return;
run_once = 1;
- /* we handle all middleend nodes as well that have no other handler */
- for (i = 0; i <= iro_Last; ++i) {
- ir_op *op = get_irp_opcode(i);
- if (op->ops.be_ops == NULL)
- op->ops.be_ops = be_ops;
- }
-
cur_opcode = get_next_ir_opcodes(iro_$arch\_last);
$arch\_opcode_start = cur_opcode;
ENDOFMAIN
+ if (defined($default_op_attr_type)) {
+ print OUT "\tattrs = xmalloc(sizeof(attr[0]) * iro_$arch\_last);\n";
+ print OUT "\tmemset(attrs, 0, sizeof(attr[0]) * iro_$arch\_last);\n";
+ }
+
print OUT @obst_new_irop;
print OUT "\n";
print OUT "\t$arch\_register_additional_opcodes(cur_opcode);\n" if (defined($additional_opcodes));
sub mangle_requirements {
my $reqs = shift;
my $class = shift;
+ my $flags = shift;
my @alternatives = split(/ /, $reqs);
for(my $idx = 0; $idx < scalar(@alternatives); $idx++) {
@alternatives = sort @alternatives;
my $name = $class."_".join('_', @alternatives);
+ if (defined($flags)) {
+ $flags =~ s/\|/_/g;
+ $name .= "_$flags";
+ }
return $name;
}
for (my $idx = 0; $idx <= $#reqs; $idx++) {
my $class = undef;
+ my ($req,) = split(/:/, $reqs[$idx]);
- if ($reqs[$idx] eq "none") {
+ if ($req eq "none") {
$class = "none";
- } elsif (is_reg_class($reqs[$idx])) {
- $class = $reqs[$idx];
+ } elsif (is_reg_class($req)) {
+ $class = $req;
} else {
- my @regs = split(/ /, $reqs[$idx]);
+ my @regs = split(/ /, $req);
GET_CLASS: foreach my $reg (@regs) {
if ($reg =~ /!?(in|out)\_r\d+/ || $reg =~ /!in/) {
$class = "UNKNOWN_CLASS";
my $idx = shift;
my $is_in = shift;
my @regs = split(/ /, shift);
+ my $flags = shift;
my @idx_class = build_inout_idx_class($node, $op, !$is_in);
push(@obst_limit_func, "static const unsigned " . $limit_name . "[] = { ");
my $first = 1;
my $limitbitsetlen = $regclass2len{$class};
- my $limitarraylen = $limitbitsetlen / 32 + ($limitbitsetlen % 32 > 0 ? 1 : 0);
+ my $limitarraylen = ($limitbitsetlen+31) / 32;
for(my $i = 0; $i < $limitarraylen; $i++) {
my $limitarraypart = $limit_array[$i];
# Generate register requirements structure
###
sub generate_requirements {
- my $reqs = shift;
+ my ($reqs, $flags) = split(/:/, shift);
my $node = shift;
my $op = shift;
my $idx = shift;
my $class = "";
my $result;
+ my @req_type_mask;
+ if (defined($flags)) {
+ foreach my $f (split(/|/, $flags)) {
+ if ($f eq "I") {
+ push(@req_type_mask, "arch_register_req_type_ignore");
+ } elsif ($f eq "S") {
+ push(@req_type_mask, "arch_register_req_type_produces_sp");
+ }
+ }
+ }
+
if ($reqs eq "none") {
$result = <<EOF;
0 /* different pos */
};
-EOF
- } elsif ($reqs =~ /^new_reg_(.*)$/) {
- if(!is_reg_class($1)) {
- die "$1 is not a register class in requirements for $op\n";
- }
- $class = $1;
- $result = <<EOF;
-{
- arch_register_req_type_should_be_different_from_all,
- & ${arch}_reg_classes[CLASS_${arch}_${class}],
- NULL, /* limit bitset */
- 0, /* same pos */
- 0 /* different pos */
-};
-
EOF
} elsif (is_reg_class($reqs)) {
+ push(@req_type_mask, "arch_register_req_type_normal");
+ my $reqtype = join(" | ", @req_type_mask);
$class = $reqs;
$result = <<EOF;
{
- arch_register_req_type_normal,
+ ${reqtype},
& ${arch}_reg_classes[CLASS_${arch}_${class}],
NULL, /* limit bitset */
0, /* same pos */
EOF
} else {
- my @req_type_mask;
my ($regclass, $limit_bitset, $same_pos, $different_pos)
- = build_subset_class_func($node, $op, $idx, $is_in, $reqs);
+ = build_subset_class_func($node, $op, $idx, $is_in, $reqs, $flags);
if (!defined($regclass)) {
die("Fatal error: Could not build subset for requirements '$reqs' of '$op' pos $idx ... exiting.\n");
push(@req_type_mask, "arch_register_req_type_should_be_same");
}
if ($different_pos != 0) {
- push(@req_type_mask, "arch_register_req_type_should_be_different");
+ push(@req_type_mask, "arch_register_req_type_must_be_different");
}
- my $reqtype = join(" | ", @req_type_mask);
+ my $reqtype = join(" | ", @req_type_mask);
if(!defined($limit_bitset)) {
$limit_bitset = "NULL";
EOF
}
- my $name = "${arch}_requirements_".mangle_requirements($reqs, $class);
+ my $name = "${arch}_requirements_".mangle_requirements($reqs, $class, $flags);
if(defined($requirements{$name})) {
return $name;
}
projects / libfirm / blobdiff