projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed mips_register_from_name() callback
[libfirm]
/
ir
/
be
/
mips
/
mips_new_nodes.c
diff --git
a/ir/be/mips/mips_new_nodes.c
b/ir/be/mips/mips_new_nodes.c
index
cc095d3
..
267dc8c
100644
(file)
--- a/
ir/be/mips/mips_new_nodes.c
+++ b/
ir/be/mips/mips_new_nodes.c
@@
-158,15
+158,15
@@
static int mips_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
}
/* dump OUT requirements */
}
/* dump OUT requirements */
- if (
attr->n_res
> 0) {
+ if (
ARR_LEN(attr->slots)
> 0) {
reqs = get_mips_out_req_all(n);
dump_reg_req(F, n, reqs, 1);
}
/* dump assigned registers */
slots = get_mips_slots(n);
reqs = get_mips_out_req_all(n);
dump_reg_req(F, n, reqs, 1);
}
/* dump assigned registers */
slots = get_mips_slots(n);
- if (slots &&
attr->n_res
> 0) {
- for (i = 0; i <
attr->n_res
; i++) {
+ if (slots &&
ARR_LEN(attr->slots)
> 0) {
+ for (i = 0; i <
ARR_LEN(attr->slots)
; i++) {
if (slots[i]) {
fprintf(F, "reg #%d = %s\n", i, slots[i]->name);
}
if (slots[i]) {
fprintf(F, "reg #%d = %s\n", i, slots[i]->name);
}
@@
-231,20
+231,21
@@
static int mips_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
* |___/
***************************************************************************************************/
* |___/
***************************************************************************************************/
-/**
- * Wraps get_irn_generic_attr() as it takes no const ir_node, so we need to do a cast.
- * Firm was made by people hating const :-(
- */
-mips_attr_t *get_mips_attr(const ir_node *node) {
+mips_attr_t *get_mips_attr(ir_node *node) {
+ assert(is_mips_irn(node) && "need mips node to get attributes");
+ return (mips_attr_t *) get_irn_generic_attr(node);
+}
+
+const mips_attr_t *get_mips_attr_const(const ir_node *node) {
assert(is_mips_irn(node) && "need mips node to get attributes");
assert(is_mips_irn(node) && "need mips node to get attributes");
- return
(mips_attr_t *)get_irn_generic_attr((ir_node *)
node);
+ return
get_irn_generic_attr_const(
node);
}
/**
* Returns the argument register requirements of a mips node.
*/
const arch_register_req_t **get_mips_in_req_all(const ir_node *node) {
}
/**
* Returns the argument register requirements of a mips node.
*/
const arch_register_req_t **get_mips_in_req_all(const ir_node *node) {
-
mips_attr_t *attr = get_mips_attr
(node);
+
const mips_attr_t *attr = get_mips_attr_const
(node);
return attr->in_req;
}
return attr->in_req;
}
@@
-252,7
+253,7
@@
const arch_register_req_t **get_mips_in_req_all(const ir_node *node) {
* Returns the result register requirements of an mips node.
*/
const arch_register_req_t **get_mips_out_req_all(const ir_node *node) {
* Returns the result register requirements of an mips node.
*/
const arch_register_req_t **get_mips_out_req_all(const ir_node *node) {
-
mips_attr_t *attr = get_mips_attr
(node);
+
const mips_attr_t *attr = get_mips_attr_const
(node);
return attr->out_req;
}
return attr->out_req;
}
@@
-260,7
+261,7
@@
const arch_register_req_t **get_mips_out_req_all(const ir_node *node) {
* Returns the argument register requirement at position pos of an mips node.
*/
const arch_register_req_t *get_mips_in_req(const ir_node *node, int pos) {
* Returns the argument register requirement at position pos of an mips node.
*/
const arch_register_req_t *get_mips_in_req(const ir_node *node, int pos) {
-
mips_attr_t *attr = get_mips_attr
(node);
+
const mips_attr_t *attr = get_mips_attr_const
(node);
return attr->in_req[pos];
}
return attr->in_req[pos];
}
@@
-268,7
+269,7
@@
const arch_register_req_t *get_mips_in_req(const ir_node *node, int pos) {
* Returns the result register requirement at position pos of an mips node.
*/
const arch_register_req_t *get_mips_out_req(const ir_node *node, int pos) {
* Returns the result register requirement at position pos of an mips node.
*/
const arch_register_req_t *get_mips_out_req(const ir_node *node, int pos) {
-
mips_attr_t *attr = get_mips_attr
(node);
+
const mips_attr_t *attr = get_mips_attr_const
(node);
return attr->out_req[pos];
}
return attr->out_req[pos];
}
@@
-292,14
+293,14
@@
void set_mips_req_in(ir_node *node, const arch_register_req_t *req, int pos) {
* Returns the register flag of an mips node.
*/
arch_irn_flags_t get_mips_flags(const ir_node *node) {
* Returns the register flag of an mips node.
*/
arch_irn_flags_t get_mips_flags(const ir_node *node) {
-
mips_attr_t *attr = get_mips_attr
(node);
+
const mips_attr_t *attr = get_mips_attr_const
(node);
return attr->flags;
}
/**
* Sets the register flag of an mips node.
*/
return attr->flags;
}
/**
* Sets the register flag of an mips node.
*/
-void set_mips_flags(
const
ir_node *node, arch_irn_flags_t flags) {
+void set_mips_flags(ir_node *node, arch_irn_flags_t flags) {
mips_attr_t *attr = get_mips_attr(node);
attr->flags = flags;
}
mips_attr_t *attr = get_mips_attr(node);
attr->flags = flags;
}
@@
-308,7
+309,7
@@
void set_mips_flags(const ir_node *node, arch_irn_flags_t flags) {
* Returns the result register slots of an mips node.
*/
const arch_register_t **get_mips_slots(const ir_node *node) {
* Returns the result register slots of an mips node.
*/
const arch_register_t **get_mips_slots(const ir_node *node) {
-
mips_attr_t *attr = get_mips_attr
(node);
+
const mips_attr_t *attr = get_mips_attr_const
(node);
return attr->slots;
}
return attr->slots;
}
@@
-316,10
+317,10
@@
const arch_register_t **get_mips_slots(const ir_node *node) {
* Returns the name of the OUT register at position pos.
*/
const char *get_mips_out_reg_name(const ir_node *node, int pos) {
* Returns the name of the OUT register at position pos.
*/
const char *get_mips_out_reg_name(const ir_node *node, int pos) {
-
mips_attr_t *attr = get_mips_attr
(node);
+
const mips_attr_t *attr = get_mips_attr_const
(node);
assert(is_mips_irn(node) && "Not an mips node.");
assert(is_mips_irn(node) && "Not an mips node.");
- assert(pos <
attr->n_res
&& "Invalid OUT position.");
+ assert(pos <
ARR_LEN(attr->slots)
&& "Invalid OUT position.");
assert(attr->slots[pos] && "No register assigned");
return arch_register_get_name(attr->slots[pos]);
assert(attr->slots[pos] && "No register assigned");
return arch_register_get_name(attr->slots[pos]);
@@
-329,10
+330,10
@@
const char *get_mips_out_reg_name(const ir_node *node, int pos) {
* Returns the index of the OUT register at position pos within its register class.
*/
int get_mips_out_regnr(const ir_node *node, int pos) {
* Returns the index of the OUT register at position pos within its register class.
*/
int get_mips_out_regnr(const ir_node *node, int pos) {
-
mips_attr_t *attr = get_mips_attr
(node);
+
const mips_attr_t *attr = get_mips_attr_const
(node);
assert(is_mips_irn(node) && "Not an mips node.");
assert(is_mips_irn(node) && "Not an mips node.");
- assert(pos <
attr->n_res
&& "Invalid OUT position.");
+ assert(pos <
ARR_LEN(attr->slots)
&& "Invalid OUT position.");
assert(attr->slots[pos] && "No register assigned");
return arch_register_get_index(attr->slots[pos]);
assert(attr->slots[pos] && "No register assigned");
return arch_register_get_index(attr->slots[pos]);
@@
-342,29
+343,21
@@
int get_mips_out_regnr(const ir_node *node, int pos) {
* Returns the OUT register at position pos.
*/
const arch_register_t *get_mips_out_reg(const ir_node *node, int pos) {
* Returns the OUT register at position pos.
*/
const arch_register_t *get_mips_out_reg(const ir_node *node, int pos) {
-
mips_attr_t *attr = get_mips_attr
(node);
+
const mips_attr_t *attr = get_mips_attr_const
(node);
assert(is_mips_irn(node) && "Not an mips node.");
assert(is_mips_irn(node) && "Not an mips node.");
- assert(pos <
attr->n_res
&& "Invalid OUT position.");
+ assert(pos <
ARR_LEN(attr->slots)
&& "Invalid OUT position.");
assert(attr->slots[pos] && "No register assigned");
return attr->slots[pos];
}
assert(attr->slots[pos] && "No register assigned");
return attr->slots[pos];
}
-/**
- * Sets the number of results.
- */
-void set_mips_n_res(ir_node *node, int n_res) {
- mips_attr_t *attr = get_mips_attr(node);
- attr->n_res = n_res;
-}
-
/**
* Returns the number of results.
*/
int get_mips_n_res(const ir_node *node) {
/**
* Returns the number of results.
*/
int get_mips_n_res(const ir_node *node) {
-
mips_attr_t *attr = get_mips_attr
(node);
- return
attr->n_res
;
+
const mips_attr_t *attr = get_mips_attr_const
(node);
+ return
ARR_LEN(attr->slots)
;
}
/**
}
/**
@@
-375,20
+368,24
@@
void init_mips_attributes(ir_node *node, arch_irn_flags_t flags, const arch_regi
const be_execution_unit_t ***execution_units,
int n_res, unsigned latency)
{
const be_execution_unit_t ***execution_units,
int n_res, unsigned latency)
{
- mips_attr_t *attr = get_mips_attr(node);
+ ir_graph *irg = get_irn_irg(node);
+ struct obstack *obst = get_irg_obstack(irg);
+ mips_attr_t *attr = get_mips_attr(node);
- attr->flags = flags;
+ attr->flags
= flags;
attr->out_req = out_reqs;
attr->out_req = out_reqs;
+ attr->in_req = in_reqs;
- attr->n_res = n_res;
- attr->in_req = in_reqs;
-
- memset((void *)attr->slots, 0, n_res * sizeof(attr->slots[0]));
+ attr->slots = NEW_ARR_D(const arch_register_t*, obst, n_res);
+ memset(attr->slots, 0, n_res * sizeof(attr->slots[0]));
}
static
}
static
-int mips_compare_attr(
mips_attr_t *a, mips_attr_t *
b)
+int mips_compare_attr(
ir_node *node_a, ir_node *node_
b)
{
{
+ const mips_attr_t *a = get_mips_attr_const(node_a);
+ const mips_attr_t *b = get_mips_attr_const(node_b);
+
if(a->tv != b->tv)
return 1;
if(a->symconst != b->symconst)
if(a->tv != b->tv)
return 1;
if(a->symconst != b->symconst)
@@
-397,7
+394,7
@@
int mips_compare_attr(mips_attr_t *a, mips_attr_t *b)
return 1;
if(a->flags != b->flags)
return 1;
return 1;
if(a->flags != b->flags)
return 1;
- if(
a->n_res != b->n_res
)
+ if(
ARR_LEN(a->slots) != ARR_LEN(b->slots)
)
return 1;
if(a->switch_default_pn != b->switch_default_pn)
return 1;
return 1;
if(a->switch_default_pn != b->switch_default_pn)
return 1;