Several BugFixes and updates:

[libfirm] / ir / be / arm / arm_emitter.h

diff --git a/ir/be/arm/arm_emitter.h b/ir/be/arm/arm_emitter.h
index 4810f15..fafdb2a 100644 (file)
--- a/ir/be/arm/arm_emitter.h
+++ b/ir/be/arm/arm_emitter.h
@@ -27,6 +27,7 @@
 #define FIRM_BE_ARM_ARM_EMITTER_H
 
 #include "firm_types.h"
+#include "pmap.h"
 #include "irargs_t.h"
 #include "debug.h"
 
@@ -34,15 +35,6 @@
 
 #include "bearch_arm_t.h"
 
-/**
- * A SymConst entry.
- */
-typedef struct _SymConstEntry {
-       unsigned label;              /**< a label number for this label */
-       const ir_node  *symconst;    /**< the node holding this label */
-       struct _SymConstEntry *next; /**< links all entries */
-} SymConstEntry;
-
 /**
  * The ARM emitter environment.
  */
@@ -50,34 +42,17 @@ typedef struct _arm_emit_env_t {
        be_emit_env_t             *emit;     /**< environment for the generic GAS emitter. */
        const arch_env_t          *arch_env; /**< the architecture environment */
        const arm_code_gen_t      *cg;       /**< the code generator object */
-       struct obstack            obst;      /**< an temporary store for SymConstEntries */
-       SymConstEntry             *symbols;  /**< list containing all SymConstEntries */
+       pmap                      *symbols;  /**< map containing all indirect symbols */
        DEBUG_ONLY(firm_dbg_module_t *mod;)
 } arm_emit_env_t;
 
-const lc_arg_env_t *arm_get_arg_env(void);
-
-void equalize_dest_src(FILE *F, ir_node *n);
-
-int get_arm_reg_nr(ir_node *irn, int posi, int in_out);
-const char *get_arm_in_reg_name(ir_node *irn, int pos);
+void arm_emit_mode(arm_emit_env_t *env, const ir_node *node);
+void arm_emit_source_register(arm_emit_env_t *env, const ir_node *node, int pos);
+void arm_emit_dest_register(arm_emit_env_t *env, const ir_node *node, int pos);
+void arm_emit_offset(arm_emit_env_t *env, const ir_node *node);
+void arm_emit_immediate(arm_emit_env_t *env, const ir_node *node);
+void arm_emit_shift(arm_emit_env_t *env, const ir_node *node);
 
 void arm_gen_routine(const arm_code_gen_t *cg, ir_graph *irg);
 
-/**
- * Sections.
- */
-typedef enum sections {
-       NO_SECTION,      /**< no section selected yet. */
-       SECTION_TEXT,    /**< text section */
-       SECTION_DATA,    /**< data section */
-       SECTION_RODATA,  /**< rodata section */
-       SECTION_COMMON,  /**< common section */
-} sections;
-
-/**
- * Switch to a new section
- */
-void arm_switch_section(FILE *f, sections sec);
-
 #endif