Fixed name mangling for private entities

[libfirm] / ir / be / ppc32 / ppc32_emitter.c

diff --git a/ir/be/ppc32/ppc32_emitter.c b/ir/be/ppc32/ppc32_emitter.c
index 990b4e9..f851188 100644 (file)
--- a/ir/be/ppc32/ppc32_emitter.c
+++ b/ir/be/ppc32/ppc32_emitter.c
@@ -23,9 +23,7 @@
  * @author  Moritz Kroll, Jens Mueller
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <limits.h>
 
@@ -40,8 +38,8 @@
 #include "irargs_t.h"
 #include "error.h"
 
-#include "../besched_t.h"
-#include "../benode_t.h"
+#include "../besched.h"
+#include "../benode.h"
 
 #include "ppc32_emitter.h"
 #include "gen_ppc32_emitter.h"
@@ -56,8 +54,6 @@ static char printbuf[SNPRINTF_BUF_LEN];
 
 extern int isleaf;
 
-static const ppc32_code_gen_t *cg;
-
 
 /*************************************************************
  *             _       _    __   _          _
@@ -105,7 +101,7 @@ static const arch_register_t *get_out_reg(const ir_node *irn, int pos) {
        if (get_irn_mode(irn) != mode_T) {
                reg = arch_get_irn_register(irn);
        } else if (is_ppc32_irn(irn)) {
-               reg = get_ppc32_out_reg(irn, pos);
+               reg = arch_irn_get_register(irn, pos);
        } else {
                const ir_edge_t *edge;
 
@@ -261,7 +257,6 @@ static void emit_be_Call(const ir_node *irn) {
        ir_entity *call_ent = be_Call_get_entity(irn);
 
        if (call_ent) {
-               set_entity_backend_marked(call_ent, 1);
                be_emit_irprintf("\tbl %s", get_entity_ld_name(call_ent));
        } else {
                be_emit_cstring("\tmtlr ");
@@ -538,7 +533,7 @@ typedef void (emit_func)(const ir_node *irn);
 /**
  * Set a node emitter. Make it a bit more type safe.
  */
-static INLINE void set_emitter(ir_op *op, emit_func ppc32_emit_node) {
+static inline void set_emitter(ir_op *op, emit_func ppc32_emit_node) {
        op->ops.generic = (op_func)ppc32_emit_node;
 }
 
@@ -601,7 +596,7 @@ static void ppc32_gen_block(const ir_node *block) {
  */
 static void ppc32_emit_start(ir_graph *irg) {
        const char *irg_name  = get_entity_ld_name(get_irg_entity(irg));
-       int         framesize = get_type_size_bytes(get_irg_frame_type(cg->irg));
+       int         framesize = get_type_size_bytes(get_irg_frame_type(irg));
 
        if(! strcmp(irg_name, "main")) {                                           // XXX: underscore hack
                irg_name = "_main";
@@ -631,7 +626,7 @@ static void ppc32_emit_start(ir_graph *irg) {
  * Emits code for function end
  */
 static void ppc32_emit_end(ir_graph *irg) {
-       int framesize = get_type_size_bytes(get_irg_frame_type(cg->irg));
+       int framesize = get_type_size_bytes(get_irg_frame_type(irg));
        (void) irg;
 
 /*     if(!isleaf) {
@@ -670,13 +665,11 @@ void ppc32_gen_labels(ir_node *block, void *env) {
 /**
  * Main driver: generates code for one routine
  */
-void ppc32_gen_routine(const ppc32_code_gen_t *ppc32_cg, ir_graph *irg)
+void ppc32_gen_routine(const ppc32_code_gen_t *cg, ir_graph *irg)
 {
        ir_node *block;
        int i, n;
 
-       cg = ppc32_cg;
-
        ppc32_register_emitters();
 
        ppc32_emit_start(irg);