* $Id$
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "irnode.h"
#include "ircons.h"
#include "irgmod.h"
int imm = 0;
ir_node *res = NULL;
ir_node *nomem, *noreg, *base, *index, *op1, *op2;
- char *offs;
+ const char *offs = NULL;
ia32_transform_env_t tenv;
const arch_register_t *out_reg, *base_reg, *index_reg;
+ int imm_tp = ia32_ImmConst;
/* must be a LEA */
if (! is_ia32_Lea(irn))
base = get_irn_n(irn, 0);
index = get_irn_n(irn,1);
- offs = get_ia32_am_offs(irn);
+ if (am_flav & ia32_O) {
+ offs = get_ia32_am_offs(irn);
+
+ if (! offs) {
+ ident *id = get_ia32_am_sc(irn);
- /* offset has a explicit sign -> we need to skip + */
- if (offs && offs[0] == '+')
- offs++;
+ assert(id != NULL);
+ offs = get_id_str(id);
+ imm_tp = ia32_ImmSymConst;
+ }
+ /* offset has a explicit sign -> we need to skip + */
+ else if (offs[0] == '+')
+ offs++;
+ }
out_reg = arch_get_irn_register(cg->arch_env, irn);
base_reg = arch_get_irn_register(cg->arch_env, base);
if (imm) {
set_ia32_cnst(res, offs);
- set_ia32_immop_type(res, ia32_ImmConst);
+ set_ia32_immop_type(res, imm_tp);
}
SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(cg, irn));
/* check only ia32 nodes with source address mode */
if (! is_ia32_irn(irn) || get_ia32_op_type(irn) != ia32_AddrModeS)
return;
+ /* no need to fix unary operations */
+ if (get_irn_arity(irn) == 4)
+ return;
base = get_irn_n(irn, 0);
index = get_irn_n(irn, 1);