From 8191fe60df0c964d0ce4dfacf6d8697fde76dc22 Mon Sep 17 00:00:00 2001 From: Michael Beck Date: Tue, 8 Nov 2005 14:31:11 +0000 Subject: [PATCH] calling convetions are now read from the method type [r6888] --- ir/tr/mangle.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ir/tr/mangle.c b/ir/tr/mangle.c index 9cd6ad7a3..04c656361 100644 --- a/ir/tr/mangle.c +++ b/ir/tr/mangle.c @@ -13,13 +13,13 @@ # include "config.h" #endif -# include "mangle.h" -# include "obst.h" +#include "mangle.h" +#include "obst.h" /* Make types visible to allow most efficient access */ -# include "entity_t.h" -# include "type_t.h" -# include "tpop_t.h" +#include "entity_t.h" +#include "type_t.h" +#include "tpop_t.h" /** a obstack used for temporary space */ static struct obstack mangle_obst; @@ -102,7 +102,7 @@ ident *mangle_u (ident *first, ident* scnd) { /* returns a mangled name for a Win32 function using it's calling convention */ ident *decorate_win32_c_fkt(entity *ent) { type *tp = get_entity_type(ent); - unsigned cc_mask = get_entity_calling_convention(ent); + unsigned cc_mask = get_method_calling_convention(tp); char buf[16]; int size, i; @@ -117,7 +117,7 @@ ident *decorate_win32_c_fkt(entity *ent) { snprintf(buf, sizeof(buf), "@%d", size); - if (cc_mask & irg_cc_reg_param) + if (cc_mask & cc_reg_param) return mangle3("@", get_entity_ident(ent), buf); else return mangle3("_", get_entity_ident(ent), buf); -- 2.20.1