Reuse already fetched values.

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

diff --git a/ir/be/arm/arm_emitter.c b/ir/be/arm/arm_emitter.c
index 2d03c2a..b22754e 100644 (file)
--- a/ir/be/arm/arm_emitter.c
+++ b/ir/be/arm/arm_emitter.c
@@ -45,7 +45,7 @@
 
 #include "../besched.h"
 #include "../beblocksched.h"
-#include "../beirg_t.h"
+#include "../beirg.h"
 #include "../begnuas.h"
 #include "../be_dbgout.h"
 
@@ -118,7 +118,7 @@ static const arch_register_t *get_out_reg(const ir_node *node, int pos)
     if (get_irn_mode(node) != mode_T) {
         reg = arch_get_irn_register(node);
     } else if (is_arm_irn(node)) {
-        reg = get_arm_out_reg(node, pos);
+        reg = arch_irn_get_register(node, pos);
     } else {
         const ir_edge_t *edge;
 
@@ -330,9 +330,9 @@ static ir_node *get_cfop_target_block(const ir_node *irn) {
  * Emits a block label for the given block.
  */
 static void arm_emit_block_name(const ir_node *block) {
-       if (has_Block_label(block)) {
-               be_emit_string(be_gas_block_label_prefix());
-               be_emit_irprintf("%lu", get_Block_label(block));
+       if (has_Block_entity(block)) {
+               ir_entity *entity = get_Block_entity(block);
+               be_gas_emit_entity(entity);
        } else {
                be_emit_cstring(BLOCK_PREFIX);
                be_emit_irprintf("%d", get_irn_node_nr(block));
@@ -989,7 +989,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 arm_emit_node) {
+static inline void set_emitter(ir_op *op, emit_func arm_emit_node) {
        op->ops.generic = (op_func)arm_emit_node;
 }