X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_dw.c;h=777e24fb16a85c110869eba6f3127284d919601e;hb=f667113899d26608e395458858dd22ad780d8beb;hp=49b7c5bca6c43202979e3aac88d2c6817e8257cc;hpb=59b7c2f481f34bc5de5aaab11edd2d2a948c555c;p=libfirm

diff --git a/ir/lower/lower_dw.c b/ir/lower/lower_dw.c
index 49b7c5bca..777e24fb1 100644
--- a/ir/lower/lower_dw.c
+++ b/ir/lower/lower_dw.c
@@ -73,7 +73,7 @@ typedef struct _op_mode_entry {
 	const ir_op   *op;    /**< the op */
 	const ir_mode *imode; /**< the input mode */
 	const ir_mode *omode; /**< the output mode */
-	entity        *ent;   /**< the associated entity of this (op, imode, omode) triple */
+	ir_entity     *ent;   /**< the associated entity of this (op, imode, omode) triple */
 } op_mode_entry_t;
 
 /**
@@ -490,7 +490,7 @@ static ir_node *get_intrinsic_address(ir_type *method, ir_op *op,
                                       ir_mode *imode, ir_mode *omode,
                                       ir_node *block, lower_env_t *env) {
 	symconst_symbol sym;
-	entity *ent;
+	ir_entity *ent;
 	op_mode_entry_t key, *entry;
 
 	key.op    = op;
@@ -679,7 +679,9 @@ static void lower_Mod(ir_node *node, ir_mode *mode, lower_env_t *env) {
  * Create two intrinsic Calls.
  */
 static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) {
-	ir_node  *block, *proj, *irn, *mem, *callDiv, *callMod, *resDiv, *resMod;
+	ir_node  *block, *proj, *irn, *mem, *callDiv, *callMod;
+	ir_node  *resDiv = NULL;
+	ir_node  *resMod = NULL;
 	ir_node  *in[4];
 	ir_mode  *opmode;
 	dbg_info *dbg;
@@ -1699,12 +1701,12 @@ static ir_type *lower_mtp(ir_type *mtp, lower_env_t *env) {
  * Translate a Return.
  */
 static void lower_Return(ir_node *node, ir_mode *mode, lower_env_t *env) {
-	ir_graph *irg = current_ir_graph;
-	entity   *ent = get_irg_entity(irg);
-	ir_type  *mtp = get_entity_type(ent);
-	ir_node  **in;
-	int      i, j, n, idx;
-	int      need_conv = 0;
+	ir_graph  *irg = current_ir_graph;
+	ir_entity *ent = get_irg_entity(irg);
+	ir_type   *mtp = get_entity_type(ent);
+	ir_node   **in;
+	int       i, j, n, idx;
+	int       need_conv = 0;
 
 	/* check if this return must be lowered */
 	for (i = 0, n = get_Return_n_ress(node); i < n; ++i) {
@@ -1756,13 +1758,13 @@ static void lower_Return(ir_node *node, ir_mode *mode, lower_env_t *env) {
  * Translate the parameters.
  */
 static void lower_Start(ir_node *node, ir_mode *mode, lower_env_t *env) {
-	ir_graph *irg = current_ir_graph;
-	entity   *ent = get_irg_entity(irg);
-	ir_type  *tp  = get_entity_type(ent);
-	ir_type  *mtp;
-	long     *new_projs;
-	int      i, j, n_params, rem;
-	ir_node  *proj, *args;
+	ir_graph  *irg = current_ir_graph;
+	ir_entity *ent = get_irg_entity(irg);
+	ir_type   *tp  = get_entity_type(ent);
+	ir_type   *mtp;
+	long      *new_projs;
+	int       i, j, n_params, rem;
+	ir_node   *proj, *args;
 
 	if (is_lowered_type(tp)) {
 		mtp = get_associated_type(tp);
@@ -2108,7 +2110,7 @@ static void lower_Psi(ir_node *psi, ir_mode *mode, lower_env_t *env) {
 /**
  * check for opcodes that must always be lowered.
  */
-static int always_lower(opcode code) {
+static int always_lower(ir_opcode code) {
 	switch (code) {
 	case iro_Proj:
 	case iro_Start:
@@ -2457,13 +2459,13 @@ void lower_dw_ops(const lwrdw_param_t *param)
 }  /* lower_dw_ops */
 
 /* Default implementation. */
-entity *def_create_intrinsic_fkt(ir_type *method, const ir_op *op,
-                                 const ir_mode *imode, const ir_mode *omode,
-                                 void *context)
+ir_entity *def_create_intrinsic_fkt(ir_type *method, const ir_op *op,
+                                    const ir_mode *imode, const ir_mode *omode,
+                                    void *context)
 {
 	char buf[64];
 	ident *id;
-	entity *ent;
+	ir_entity *ent;
 
 	if (imode == omode) {
 		snprintf(buf, sizeof(buf), "__l%s%s", get_op_name(op), get_mode_name(imode));