Commit ce3205fb authored by Moritz Kroll's avatar Moritz Kroll
Browse files

Some minor changes

[r25748]
parent 6a27ceed
...@@ -46,12 +46,12 @@ def get_io_type(type, attrname, nodename): ...@@ -46,12 +46,12 @@ def get_io_type(type, attrname, nodename):
elif type == "pn_Cmp" or type == "ir_where_alloc": elif type == "pn_Cmp" or type == "ir_where_alloc":
importcmd = "%s %s = (%s) read_long(env);" % (type, attrname, type) importcmd = "%s %s = (%s) read_long(env);" % (type, attrname, type)
exportcmd = """fprintf(env->file, "%%ld ", (long) %(val)s);""" exportcmd = """fprintf(env->file, "%%ld ", (long) %(val)s);"""
elif type == "cons_flags" and nodename == "Store": elif type == "ir_cons_flags" and nodename == "Store":
importcmd = "ir_cons_flags %s = get_cons_flags(env);" % attrname importcmd = "ir_cons_flags %s = get_cons_flags(env);" % attrname
exportcmd = """write_pin_state(env, irn); exportcmd = """write_pin_state(env, irn);
write_volatility(env, irn); write_volatility(env, irn);
write_align(env, irn);""" write_align(env, irn);"""
elif type == "cons_flags" and nodename == "Load": elif type == "ir_cons_flags" and nodename == "Load":
importcmd = "ir_cons_flags %s = get_cons_flags(env);" % attrname importcmd = "ir_cons_flags %s = get_cons_flags(env);" % attrname
exportcmd = """write_pin_state(env, irn); exportcmd = """write_pin_state(env, irn);
write_volatility(env, irn); write_volatility(env, irn);
......
...@@ -3,8 +3,8 @@ Start = dict( ...@@ -3,8 +3,8 @@ Start = dict(
mode = "mode_T", mode = "mode_T",
op_flags = "cfopcode", op_flags = "cfopcode",
state = "pinned", state = "pinned",
knownBlock = True,
noconstr = True, noconstr = True,
optimize = False
), ),
End = dict( End = dict(
...@@ -12,8 +12,8 @@ End = dict( ...@@ -12,8 +12,8 @@ End = dict(
op_flags = "cfopcode", op_flags = "cfopcode",
state = "pinned", state = "pinned",
arity = "dynamic", arity = "dynamic",
knownBlock = True,
noconstr = True, noconstr = True,
optimize = False
), ),
Phi = dict( Phi = dict(
...@@ -39,6 +39,7 @@ IJmp = dict( ...@@ -39,6 +39,7 @@ IJmp = dict(
Const = dict( Const = dict(
mode = "", mode = "",
knownBlock = True, knownBlock = True,
attrs_name = "con",
attrs = [ attrs = [
dict( dict(
type = "tarval*", type = "tarval*",
...@@ -51,7 +52,28 @@ Block = dict( ...@@ -51,7 +52,28 @@ Block = dict(
mode = "mode_BB", mode = "mode_BB",
knownBlock = True, knownBlock = True,
noconstr = True, noconstr = True,
optimize = False,
arity = "variable", arity = "variable",
init = '''
/* macroblock header */
res->in[0] = res;
res->attr.block.is_dead = 0;
res->attr.block.is_mb_head = 1;
res->attr.block.has_label = 0;
res->attr.block.irg = irg;
res->attr.block.backedge = new_backedge_arr(irg->obst, arity);
res->attr.block.in_cg = NULL;
res->attr.block.cg_backedge = NULL;
res->attr.block.extblk = NULL;
res->attr.block.mb_depth = 0;
res->attr.block.label = 0;
set_Block_matured(res, 1);
set_Block_block_visited(res, 0);
''',
java_add = ''' java_add = '''
public void addPred(Node node) { public void addPred(Node node) {
binding_cons.add_immBlock_pred(ptr, node.ptr); binding_cons.add_immBlock_pred(ptr, node.ptr);
...@@ -263,7 +285,7 @@ Load = dict( ...@@ -263,7 +285,7 @@ Load = dict(
], ],
constructor_args = [ constructor_args = [
dict( dict(
type = "cons_flags", type = "ir_cons_flags",
name = "flags", name = "flags",
), ),
], ],
...@@ -274,7 +296,7 @@ Store = dict( ...@@ -274,7 +296,7 @@ Store = dict(
outs = [ "M", "X_regular", "X_except" ], outs = [ "M", "X_regular", "X_except" ],
constructor_args = [ constructor_args = [
dict( dict(
type = "cons_flags", type = "ir_cons_flags",
name = "flags", name = "flags",
), ),
], ],
...@@ -329,6 +351,7 @@ Sel = dict( ...@@ -329,6 +351,7 @@ Sel = dict(
Sync = dict( Sync = dict(
mode = "mode_M", mode = "mode_M",
optimize = False,
arity = "dynamic" arity = "dynamic"
), ),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment