projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
another instance of wrong block in new_Proj
[libfirm]
/
ir
/
ir
/
irprog.c
diff --git
a/ir/ir/irprog.c
b/ir/ir/irprog.c
index
81ba986
..
8941410
100644
(file)
--- a/
ir/ir/irprog.c
+++ b/
ir/ir/irprog.c
@@
-69,13
+69,18
@@
static ir_prog *new_incomplete_ir_prog(void)
return res;
}
return res;
}
-/** Completes an incomplete irprog. */
-static ir_prog *complete_ir_prog(ir_prog *irp) {
+/**
+ * Completes an incomplete irprog.
+ *
+ * @param irp the (yet incomplete) irp
+ * @param module_name the (module) name for this irp
+ */
+static ir_prog *complete_ir_prog(ir_prog *irp, const char *module_name) {
int i;
int i;
-#define IDENT(s) new_id_from_chars(s, sizeof(s)-1)
- irp->name = IDENT(INITAL_PROG_NAME);
+#define IDENT(x) new_id_from_chars(x, sizeof(x) - 1)
+ irp->name = new_id_from_str(module_name);
irp->segment_types[IR_SEGMENT_GLOBAL] = new_type_class(IDENT("GlobalType"));
irp->segment_types[IR_SEGMENT_THREAD_LOCAL]
= new_type_struct(IDENT("ThreadLocal"));
irp->segment_types[IR_SEGMENT_GLOBAL] = new_type_class(IDENT("GlobalType"));
irp->segment_types[IR_SEGMENT_THREAD_LOCAL]
= new_type_struct(IDENT("ThreadLocal"));
@@
-118,13
+123,13
@@
void init_irprog_1(void) {
/* Completes ir_prog. */
void init_irprog_2(void) {
/* Completes ir_prog. */
void init_irprog_2(void) {
-
complete_ir_prog(irp
);
+
(void)complete_ir_prog(irp, INITAL_PROG_NAME
);
}
/* Create a new ir prog. Automatically called by init_firm through
init_irprog. */
}
/* Create a new ir prog. Automatically called by init_firm through
init_irprog. */
-ir_prog *new_ir_prog(
void
) {
- return complete_ir_prog(new_incomplete_ir_prog());
+ir_prog *new_ir_prog(
const char *name
) {
+ return complete_ir_prog(new_incomplete_ir_prog()
, name
);
}
/* frees all memory used by irp. Types in type list, irgs in irg
}
/* frees all memory used by irp. Types in type list, irgs in irg
@@
-317,7
+322,7
@@
void add_irp_opcode(ir_op *opcode) {
assert(irp);
len = ARR_LEN(irp->opcodes);
code = opcode->code;
assert(irp);
len = ARR_LEN(irp->opcodes);
code = opcode->code;
- if (code >= len) {
+ if (
(int)
code >= len) {
ARR_RESIZE(ir_op*, irp->opcodes, code+1);
memset(&irp->opcodes[len], 0, (code-len+1) * sizeof(irp->opcodes[0]));
}
ARR_RESIZE(ir_op*, irp->opcodes, code+1);
memset(&irp->opcodes[len], 0, (code-len+1) * sizeof(irp->opcodes[0]));
}
@@
-359,10
+364,10
@@
void set_irp_prog_name(ident *name) {
int irp_prog_name_is_set(void) {
return irp->name != new_id_from_str(INITAL_PROG_NAME);
}
int irp_prog_name_is_set(void) {
return irp->name != new_id_from_str(INITAL_PROG_NAME);
}
-ident *get_irp_
prog_
ident(void) {
+ident *get_irp_ident(void) {
return irp->name;
}
return irp->name;
}
-const char *get_irp_
prog_
name(void) {
+const char *get_irp_name(void) {
return get_id_str(irp->name);
}
return get_id_str(irp->name);
}