diff options
Diffstat (limited to 'opcodes')
| -rw-r--r-- | opcodes/ChangeLog | 5 | ||||
| -rw-r--r-- | opcodes/s12z-dis.c | 57 |
2 files changed, 32 insertions, 30 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 437590e..d17ee10 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2019-01-09 John Darrington <john@darrington.wattle.id.au> + + * s12z-dis.c (opr_emit_disassembly): Do not omit an index if it is + zero. + 2019-01-09 Andrew Paprocki <andrew@ishiboo.com> * configure: Regenerate. diff --git a/opcodes/s12z-dis.c b/opcodes/s12z-dis.c index 14176fb..5db0b43 100644 --- a/opcodes/s12z-dis.c +++ b/opcodes/s12z-dis.c @@ -282,36 +282,33 @@ opr_emit_disassembly (const struct operand *opr, struct memory_operand *mo = (struct memory_operand *) opr; (*info->fprintf_func) (info->stream, "%c", mo->indirect ? '[' : '('); - if (mo->base_offset != 0) - { - (*info->fprintf_func) (info->stream, "%d", mo->base_offset); - } - else if (mo->n_regs > 0) - { - const char *fmt; - switch (mo->mutation) - { - case OPND_RM_PRE_DEC: - fmt = "-%s"; - break; - case OPND_RM_PRE_INC: - fmt = "+%s"; - break; - case OPND_RM_POST_DEC: - fmt = "%s-"; - break; - case OPND_RM_POST_INC: - fmt = "%s+"; - break; - case OPND_RM_NONE: - default: - fmt = "%s"; - break; - } - (*info->fprintf_func) (info->stream, fmt, - registers[mo->regs[0]].name); - used_reg = 1; - } + const char *fmt; + assert (mo->mutation == OPND_RM_NONE || mo->n_regs == 1); + switch (mo->mutation) + { + case OPND_RM_PRE_DEC: + fmt = "-%s"; + break; + case OPND_RM_PRE_INC: + fmt = "+%s"; + break; + case OPND_RM_POST_DEC: + fmt = "%s-"; + break; + case OPND_RM_POST_INC: + fmt = "%s+"; + break; + case OPND_RM_NONE: + default: + if (mo->n_regs < 2) + (*info->fprintf_func) (info->stream, (mo->n_regs == 0) ? "%d" : "%d,", mo->base_offset); + fmt = "%s"; + break; + } + if (mo->n_regs > 0) + (*info->fprintf_func) (info->stream, fmt, + registers[mo->regs[0]].name); + used_reg = 1; if (mo->n_regs > used_reg) { |