size = obstack_object_size(attr->am_offs);
if (size > 0) {
- res = xcalloc(1, size + 1);
- memcpy(res, obstack_base(attr->am_offs), size);
+ res = xcalloc(1, size + 2);
+ res[0] = attr->offs_sign;
+ memcpy(&res[1], obstack_base(attr->am_offs), size);
}
- res[size] = '\0';
+ res[size + 1] = '\0';
return res;
}
static void extend_ia32_am_offs(ir_node *node, char *offset, char op) {
ia32_attr_t *attr = get_ia32_attr(node);
+ if (! offset)
+ return;
+
+ /* offset could already have an explicit sign */
+ /* -> supersede op if necessary */
+ if (offset[0] == '-' || offset[0] == '+') {
+ op = offset[0];
+ offset++;
+ }
+
if (!attr->am_offs) {
/* obstack is not initialized */
attr->am_offs = xcalloc(1, sizeof(*(attr->am_offs)));
obstack_init(attr->am_offs);
+ attr->offs_sign = op;
}
else {
- /* obstack is initialized -> there is already one offset */
- /* present -> connect the offsets with an add */
- obstack_printf(attr->am_offs, " %c ", op);
+ /* If obstack is initialized, connect the new offset with op */
+ obstack_printf(attr->am_offs, "%c", op);
}
obstack_printf(attr->am_offs, "%s", offset);
/**
* Gets the string representation of the internal const (tv or symconst)
*/
-char *get_ia32_cnst(ir_node *node) {
+char *get_ia32_cnst(const ir_node *node) {
ia32_attr_t *attr = get_ia32_attr(node);
return attr->cnst;
}