X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fmips%2Fbearch_mips.c;h=e3097307a532309a2867e160f53280d08125f6c0;hb=213c4b9fb82f0fb180920fafe45123b225f9b2d1;hp=b93ca39d153d898b56cc79953febfd65c32c8ecf;hpb=fe2856f2a2568057faeda34f68326a79794d9abf;p=libfirm

diff --git a/ir/be/mips/bearch_mips.c b/ir/be/mips/bearch_mips.c
index b93ca39d1..e3097307a 100644
--- a/ir/be/mips/bearch_mips.c
+++ b/ir/be/mips/bearch_mips.c
@@ -228,7 +228,7 @@ static arch_irn_flags_t mips_get_flags(const void *self, const ir_node *irn) {
 	return 0;
 }
 
-static entity *mips_get_frame_entity(const void *self, const ir_node *irn) {
+static ir_entity *mips_get_frame_entity(const void *self, const ir_node *irn) {
 	if(is_mips_load_r(irn) || is_mips_store_r(irn)) {
 		mips_attr_t *attr = get_mips_attr(irn);
 
@@ -238,7 +238,7 @@ static entity *mips_get_frame_entity(const void *self, const ir_node *irn) {
 	return NULL;
 }
 
-static void mips_set_frame_entity(const void *self, ir_node *irn, entity *ent) {
+static void mips_set_frame_entity(const void *self, ir_node *irn, ir_entity *ent) {
 	mips_attr_t *attr  = get_mips_attr(irn);
 	assert(is_mips_load_r(irn) || is_mips_store_r(irn));
 	attr->stack_entity = ent;
@@ -798,11 +798,11 @@ static ir_type *mips_abi_get_between_type(void *self) {
 
 	static ir_type *debug_between_type = NULL;
 	static ir_type *opt_between_type = NULL;
-	static entity *old_fp_ent    = NULL;
+	static ir_entity *old_fp_ent    = NULL;
 
 	if(env->debug && debug_between_type == NULL) {
-		entity *a0_ent, *a1_ent, *a2_ent, *a3_ent;
-		entity *ret_addr_ent;
+		ir_entity *a0_ent, *a1_ent, *a2_ent, *a3_ent;
+		ir_entity *ret_addr_ent;
 		ir_type *ret_addr_type = new_type_primitive(new_id_from_str("return_addr"), mode_P);
 		ir_type *old_fp_type   = new_type_primitive(new_id_from_str("fp"), mode_P);
 		ir_type *old_param_type = new_type_primitive(new_id_from_str("param"), mode_Iu);
@@ -815,21 +815,21 @@ static ir_type *mips_abi_get_between_type(void *self) {
 		old_fp_ent             = new_entity(debug_between_type, new_id_from_str("old_fp"), old_fp_type);
 		ret_addr_ent           = new_entity(debug_between_type, new_id_from_str("ret_addr"), ret_addr_type);
 
-		set_entity_offset_bytes(a0_ent, 0);
-		set_entity_offset_bytes(a1_ent, 4);
-		set_entity_offset_bytes(a2_ent, 8);
-		set_entity_offset_bytes(a3_ent, 12);
-		set_entity_offset_bytes(old_fp_ent, 16);
-		set_entity_offset_bytes(ret_addr_ent, 20);
+		set_entity_offset(a0_ent, 0);
+		set_entity_offset(a1_ent, 4);
+		set_entity_offset(a2_ent, 8);
+		set_entity_offset(a3_ent, 12);
+		set_entity_offset(old_fp_ent, 16);
+		set_entity_offset(ret_addr_ent, 20);
 
 		set_type_size_bytes(debug_between_type, 24);
 	} else if(!env->debug && opt_between_type == NULL) {
 		ir_type *old_fp_type   = new_type_primitive(new_id_from_str("fp"), mode_P);
-		entity *old_fp_ent;
+		ir_entity *old_fp_ent;
 
 		opt_between_type       = new_type_class(new_id_from_str("mips_between_type"));
 		old_fp_ent             = new_entity(opt_between_type, new_id_from_str("old_fp"), old_fp_type);
-		set_entity_offset_bytes(old_fp_ent, 0);
+		set_entity_offset(old_fp_ent, 0);
 		set_type_size_bytes(opt_between_type, 4);
 	}