adapted to changes

[libfirm] / ir / be / ia32 / ia32_emitter.c

diff --git a/ir/be/ia32/ia32_emitter.c b/ir/be/ia32/ia32_emitter.c
index f3059a1..358e1ce 100644 (file)
--- a/ir/be/ia32/ia32_emitter.c
+++ b/ir/be/ia32/ia32_emitter.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <limits.h>
 
 #include "tv.h"
@@ -56,7 +60,7 @@ const char *node_const_to_str(ir_node *n) {
  */
 char *node_offset_to_str(ir_node *n) {
        char   *buf;
-       tarval *tv = get_ia32_offs(n);
+       tarval *tv = get_ia32_am_offs(n);
 
        if (tv) {
                buf = malloc(SNPRINTF_BUF_LEN);
@@ -134,15 +138,8 @@ static const arch_register_t *get_out_reg(ir_node *irn, int pos) {
  */
 int get_ia32_reg_nr(ir_node *irn, int pos, int in_out) {
        const arch_register_t *reg;
-       ir_node               *op;
 
        if (in_out == 1) {
-               /* special case Proj P_fame_base */
-               op = get_irn_n(irn, pos);
-               if (is_Proj(op) && get_Proj_proj(op) == pn_Start_P_frame_base) {
-                       return 10;
-               }
-
                reg = get_in_reg(irn, pos);
        }
        else {
@@ -157,14 +154,8 @@ int get_ia32_reg_nr(ir_node *irn, int pos, int in_out) {
  */
 const char *get_ia32_reg_name(ir_node *irn, int pos, int in_out) {
        const arch_register_t *reg;
-       ir_node               *op;
 
        if (in_out == 1) {
-               /* special case Proj P_fame_base */
-               op = get_irn_n(irn, pos);
-               if (is_Proj(op) && get_Proj_proj(op) == pn_Start_P_frame_base) {
-                       return "x(esp)";
-               }
                reg = get_in_reg(irn, pos);
        }
        else {
@@ -693,8 +684,6 @@ void ia32_emit_node(ir_node *irn, void *env) {
 
        IA32_EMIT(Mul);
        IA32_EMIT(Mul_i);
-       IA32_EMIT(Mulh);
-       IA32_EMIT(Mulh_i);
 
        IA32_EMIT(Cltd);
        IA32_EMIT(DivMod);