diff options
Diffstat (limited to 'opcodes/z80-dis.c')
| -rw-r--r-- | opcodes/z80-dis.c | 624 |
1 files changed, 431 insertions, 193 deletions
diff --git a/opcodes/z80-dis.c b/opcodes/z80-dis.c index a0e1025..99be7f8 100644 --- a/opcodes/z80-dis.c +++ b/opcodes/z80-dis.c @@ -1,4 +1,4 @@ -/* Print Z80 and R800 instructions +/* Print Z80, Z180, EZ80 and R800 instructions Copyright (C) 2005-2020 Free Software Foundation, Inc. Contributed by Arnold Metselaar <arnold_m@operamail.com> @@ -28,38 +28,61 @@ struct buffer bfd_vma base; int n_fetch; int n_used; - signed char data[4]; + signed char data[6]; + long inss; /* instruction set bit mask, taken from bfd_mach */ + int nn_len; /* address length: 2 - Z80 mode, 3 - ADL mode*/ } ; -typedef int (*func)(struct buffer *, disassemble_info *, char *); +typedef int (*func)(struct buffer *, disassemble_info *, const char *); struct tab_elt { unsigned char val; unsigned char mask; func fp; - char * text; + const char * text; + unsigned inss; /* bit mask of supported bfd_mach_* or 0 for all mach */ } ; +#define INSS_ALL 0 +#define INSS_Z80 ((1 << bfd_mach_z80) | (1 << bfd_mach_z80strict) | (1 << bfd_mach_z80full)) +#define INSS_R800 (1 << bfd_mach_r800) +#define INSS_GBZ80 (1 << bfd_mach_gbz80) +#define INSS_Z180 (1 << bfd_mach_z180) +#define INSS_EZ80_Z80 (1 << bfd_mach_ez80_z80) +#define INSS_EZ80_ADL (1 << bfd_mach_ez80_adl) +#define INSS_EZ80 (INSS_EZ80_ADL | INSS_EZ80_Z80) + #define TXTSIZ 24 /* Names of 16-bit registers. */ -static char * rr_str[] = { "bc", "de", "hl", "sp" }; +static const char * rr_str[] = { "bc", "de", "hl", "sp" }; /* Names of 8-bit registers. */ -static char * r_str[] = { "b", "c", "d", "e", "h", "l", "(hl)", "a" }; +static const char * r_str[] = { "b", "c", "d", "e", "h", "l", "(hl)", "a" }; /* Texts for condition codes. */ -static char * cc_str[] = { "nz", "z", "nc", "c", "po", "pe", "p", "m" }; +static const char * cc_str[] = { "nz", "z", "nc", "c", "po", "pe", "p", "m" }; /* Instruction names for 8-bit arithmetic, operand "a" is often implicit */ -static char * arit_str[] = +static const char * arit_str[] = { "add a,", "adc a,", "sub ", "sbc a,", "and ", "xor ", "or ", "cp " } ; +static const char * arit_str_ez80[] = +{ + "add a,", "adc a,", "sub a,", "sbc a,", "and a,", "xor a,", "or a,", "cp a," +} ; + static int +mach_inst (struct buffer *buf, struct tab_elt *p) +{ + return !p->inss || (p->inss & buf->inss); +} + +static int fetch_data (struct buffer *buf, disassemble_info * info, int n) { int r; - if (buf->n_fetch + n > 4) + if (buf->n_fetch + n > (int)sizeof(buf->data)) abort (); r = info->read_memory_func (buf->base + buf->n_fetch, @@ -71,7 +94,7 @@ fetch_data (struct buffer *buf, disassemble_info * info, int n) } static int -prt (struct buffer *buf, disassemble_info * info, char *txt) +prt (struct buffer *buf, disassemble_info * info, const char *txt) { info->fprintf_func (info->stream, "%s", txt); buf->n_used = buf->n_fetch; @@ -79,7 +102,7 @@ prt (struct buffer *buf, disassemble_info * info, char *txt) } static int -prt_e (struct buffer *buf, disassemble_info * info, char *txt) +prt_e (struct buffer *buf, disassemble_info * info, const char *txt) { char e; int target_addr; @@ -98,7 +121,7 @@ prt_e (struct buffer *buf, disassemble_info * info, char *txt) } static int -jr_cc (struct buffer *buf, disassemble_info * info, char *txt) +jr_cc (struct buffer *buf, disassemble_info * info, const char *txt) { char mytxt[TXTSIZ]; @@ -107,15 +130,19 @@ jr_cc (struct buffer *buf, disassemble_info * info, char *txt) } static int -prt_nn (struct buffer *buf, disassemble_info * info, char *txt) +prt_nn (struct buffer *buf, disassemble_info * info, const char *txt) { int nn; unsigned char *p; + int i; p = (unsigned char*) buf->data + buf->n_fetch; - if (fetch_data (buf, info, 2)) + if (fetch_data (buf, info, buf->nn_len)) { - nn = p[0] + (p[1] << 8); + nn = 0; + i = buf->nn_len; + while (i--) + nn = nn * 0x100 + p[i]; info->fprintf_func (info->stream, txt, nn); buf->n_used = buf->n_fetch; } @@ -125,7 +152,7 @@ prt_nn (struct buffer *buf, disassemble_info * info, char *txt) } static int -prt_rr_nn (struct buffer *buf, disassemble_info * info, char *txt) +prt_rr_nn (struct buffer *buf, disassemble_info * info, const char *txt) { char mytxt[TXTSIZ]; int rr; @@ -136,7 +163,7 @@ prt_rr_nn (struct buffer *buf, disassemble_info * info, char *txt) } static int -prt_rr (struct buffer *buf, disassemble_info * info, char *txt) +prt_rr (struct buffer *buf, disassemble_info * info, const char *txt) { info->fprintf_func (info->stream, "%s%s", txt, rr_str[(buf->data[buf->n_fetch - 1] >> 4) & 3]); @@ -145,7 +172,7 @@ prt_rr (struct buffer *buf, disassemble_info * info, char *txt) } static int -prt_n (struct buffer *buf, disassemble_info * info, char *txt) +prt_n (struct buffer *buf, disassemble_info * info, const char *txt) { int n; unsigned char *p; @@ -165,16 +192,27 @@ prt_n (struct buffer *buf, disassemble_info * info, char *txt) } static int -ld_r_n (struct buffer *buf, disassemble_info * info, char *txt) +prt_r_n (struct buffer *buf, disassemble_info * info, const char *txt) +{ + char mytxt[TXTSIZ]; + int r; + + r = (buf->data[buf->n_fetch - 1] >> 3) & 7; + snprintf (mytxt, TXTSIZ, txt, r_str[r]); + return prt_n (buf, info, mytxt); +} + +static int +ld_r_n (struct buffer *buf, disassemble_info * info, const char *txt) { char mytxt[TXTSIZ]; - snprintf (mytxt, TXTSIZ, txt, r_str[(buf->data[0] >> 3) & 7]); + snprintf (mytxt, TXTSIZ, txt, r_str[(buf->data[buf->n_fetch - 1] >> 3) & 7]); return prt_n (buf, info, mytxt); } static int -prt_r (struct buffer *buf, disassemble_info * info, char *txt) +prt_r (struct buffer *buf, disassemble_info * info, const char *txt) { info->fprintf_func (info->stream, txt, r_str[(buf->data[buf->n_fetch - 1] >> 3) & 7]); @@ -183,7 +221,7 @@ prt_r (struct buffer *buf, disassemble_info * info, char *txt) } static int -ld_r_r (struct buffer *buf, disassemble_info * info, char *txt) +ld_r_r (struct buffer *buf, disassemble_info * info, const char *txt) { info->fprintf_func (info->stream, txt, r_str[(buf->data[buf->n_fetch - 1] >> 3) & 7], @@ -193,17 +231,53 @@ ld_r_r (struct buffer *buf, disassemble_info * info, char *txt) } static int -arit_r (struct buffer *buf, disassemble_info * info, char *txt) +prt_d (struct buffer *buf, disassemble_info * info, const char *txt) { + int d; + signed char *p; + + p = buf->data + buf->n_fetch; + + if (fetch_data (buf, info, 1)) + { + d = p[0]; + info->fprintf_func (info->stream, txt, d); + buf->n_used = buf->n_fetch; + } + else + buf->n_used = -1; + + return buf->n_used; +} + +static int +prt_rr_d (struct buffer *buf, disassemble_info * info, const char *txt) +{ + char mytxt[TXTSIZ]; + int rr; + + rr = (buf->data[buf->n_fetch - 1] >> 4) & 3; + if (rr == 3) /* SP is not supported */ + return 0; + + snprintf (mytxt, TXTSIZ, txt, rr_str[rr]); + return prt_d (buf, info, mytxt); +} + +static int +arit_r (struct buffer *buf, disassemble_info * info, const char *txt) +{ + const char * const *arit; + arit = (buf->inss & INSS_EZ80) ? arit_str_ez80 : arit_str; info->fprintf_func (info->stream, txt, - arit_str[(buf->data[buf->n_fetch - 1] >> 3) & 7], - r_str[buf->data[buf->n_fetch - 1] & 7]); + arit[(buf->data[buf->n_fetch - 1] >> 3) & 7], + r_str[buf->data[buf->n_fetch - 1] & 7]); buf->n_used = buf->n_fetch; return buf->n_used; } static int -prt_cc (struct buffer *buf, disassemble_info * info, char *txt) +prt_cc (struct buffer *buf, disassemble_info * info, const char *txt) { info->fprintf_func (info->stream, "%s%s", txt, cc_str[(buf->data[0] >> 3) & 7]); @@ -212,7 +286,7 @@ prt_cc (struct buffer *buf, disassemble_info * info, char *txt) } static int -pop_rr (struct buffer *buf, disassemble_info * info, char *txt) +pop_rr (struct buffer *buf, disassemble_info * info, const char *txt) { static char *rr_stack[] = { "bc","de","hl","af"}; @@ -224,7 +298,7 @@ pop_rr (struct buffer *buf, disassemble_info * info, char *txt) static int -jp_cc_nn (struct buffer *buf, disassemble_info * info, char *txt) +jp_cc_nn (struct buffer *buf, disassemble_info * info, const char *txt) { char mytxt[TXTSIZ]; @@ -234,16 +308,18 @@ jp_cc_nn (struct buffer *buf, disassemble_info * info, char *txt) } static int -arit_n (struct buffer *buf, disassemble_info * info, char *txt) +arit_n (struct buffer *buf, disassemble_info * info, const char *txt) { char mytxt[TXTSIZ]; + const char * const *arit; - snprintf (mytxt,TXTSIZ, txt, arit_str[(buf->data[0] >> 3) & 7]); + arit = (buf->inss & INSS_EZ80) ? arit_str_ez80 : arit_str; + snprintf (mytxt,TXTSIZ, txt, arit[(buf->data[0] >> 3) & 7]); return prt_n (buf, info, mytxt); } static int -rst (struct buffer *buf, disassemble_info * info, char *txt) +rst (struct buffer *buf, disassemble_info * info, const char *txt) { info->fprintf_func (info->stream, txt, buf->data[0] & 0x38); buf->n_used = buf->n_fetch; @@ -252,7 +328,7 @@ rst (struct buffer *buf, disassemble_info * info, char *txt) static int -cis (struct buffer *buf, disassemble_info * info, char *txt ATTRIBUTE_UNUSED) +cis (struct buffer *buf, disassemble_info * info, const char *txt ATTRIBUTE_UNUSED) { static char * opar[] = { "ld", "cp", "in", "out" }; char * op; @@ -269,7 +345,42 @@ cis (struct buffer *buf, disassemble_info * info, char *txt ATTRIBUTE_UNUSED) } static int -dump (struct buffer *buf, disassemble_info * info, char *txt) +cism (struct buffer *buf, disassemble_info * info, const char *txt ATTRIBUTE_UNUSED) +{ + static char * opar[] = { "in%cm%s", "ot%cm%s" }; + char * op; + char c; + + c = buf->data[1]; + op = opar[c & 1]; + info->fprintf_func (info->stream, + op, + (c & 0x08) ? 'd' : 'i', + (c & 0x10) ? "r" : ""); + buf->n_used = 2; + return buf->n_used; +} + +static int +cis2 (struct buffer *buf, disassemble_info * info, const char *txt ATTRIBUTE_UNUSED) +{ + static char * opar[] = { "in", "out" }; + char * op; + char c; + + c = buf->data[1]; + op = ((0x14 & c) == 0x14) ? "ot" : (opar[c & 1]); + info->fprintf_func (info->stream, + "%s%c2%s", + op, + (c & 0x08) ? 'd' : 'i', + (c & 0x10) ? "r" : ""); + buf->n_used = 2; + return buf->n_used; +} + +static int +dump (struct buffer *buf, disassemble_info * info, const char *txt) { int i; @@ -284,45 +395,85 @@ dump (struct buffer *buf, disassemble_info * info, char *txt) /* Table to disassemble machine codes with prefix 0xED. */ struct tab_elt opc_ed[] = { - { 0x70, 0xFF, prt, "in f,(c)" }, - { 0x70, 0xFF, dump, "xx" }, - { 0x40, 0xC7, prt_r, "in %s,(c)" }, - { 0x71, 0xFF, prt, "out (c),0" }, - { 0x70, 0xFF, dump, "xx" }, - { 0x41, 0xC7, prt_r, "out (c),%s" }, - { 0x42, 0xCF, prt_rr, "sbc hl," }, - { 0x43, 0xCF, prt_rr_nn, "ld (0x%%04x),%s" }, - { 0x44, 0xFF, prt, "neg" }, - { 0x45, 0xFF, prt, "retn" }, - { 0x46, 0xFF, prt, "im 0" }, - { 0x47, 0xFF, prt, "ld i,a" }, - { 0x4A, 0xCF, prt_rr, "adc hl," }, - { 0x4B, 0xCF, prt_rr_nn, "ld %s,(0x%%04x)" }, - { 0x4D, 0xFF, prt, "reti" }, - { 0x4F, 0xFF, prt, "ld r,a" }, - { 0x56, 0xFF, prt, "im 1" }, - { 0x57, 0xFF, prt, "ld a,i" }, - { 0x5E, 0xFF, prt, "im 2" }, - { 0x5F, 0xFF, prt, "ld a,r" }, - { 0x67, 0xFF, prt, "rrd" }, - { 0x6F, 0xFF, prt, "rld" }, - { 0xA0, 0xE4, cis, "" }, - { 0xC3, 0xFF, prt, "muluw hl,bc" }, - { 0xC5, 0xE7, prt_r, "mulub a,%s" }, - { 0xF3, 0xFF, prt, "muluw hl,sp" }, - { 0x00, 0x00, dump, "xx" } + { 0x30, 0xFE, dump, "xx", INSS_ALL }, + { 0x00, 0xC7, prt_r_n, "in0 %s,(0x%%02x)", INSS_Z180|INSS_EZ80 }, + { 0x01, 0xC7, prt_r_n, "out0 (0x%%02x),%s", INSS_Z180|INSS_EZ80 }, + { 0x32, 0xFF, prt_d, "lea ix,ix%+d", INSS_EZ80 }, + { 0x33, 0xFF, prt_d, "lea iy,iy%+d", INSS_EZ80 }, + { 0x02, 0xCF, prt_rr_d, "lea %s,ix%%+d", INSS_EZ80 }, + { 0x03, 0xCF, prt_rr_d, "lea %s,iy%%+d", INSS_EZ80 }, + { 0x04, 0xC7, prt_r, "tst %s", INSS_Z180}, + { 0x04, 0xC7, prt_r, "tst a,%s", INSS_EZ80 }, + { 0x07, 0xFF, prt, "ld bc,(hl)", INSS_EZ80 }, + { 0x0F, 0xCF, prt_rr, "ld (hl),", INSS_EZ80 }, + { 0x17, 0xFF, prt, "ld de,(hl)", INSS_EZ80 }, + { 0x27, 0xFF, prt, "ld hl,(hl)", INSS_EZ80 }, + { 0x36, 0xFF, prt, "ld iy,(hl)", INSS_EZ80 }, + { 0x37, 0xFF, prt, "ld ix,(hl)", INSS_EZ80 }, + { 0x3E, 0xFF, prt, "ld (hl),iy", INSS_EZ80 }, + { 0x3F, 0xFF, prt, "ld (hl),ix", INSS_EZ80 }, + { 0x70, 0xFF, prt, "in f,(c)", INSS_Z80 | INSS_R800 }, + { 0x70, 0xFF, dump, "xx", INSS_ALL }, + { 0x40, 0xC7, prt_r, "in %s,(bc)", INSS_EZ80 }, + { 0x40, 0xC7, prt_r, "in %s,(c)", INSS_ALL }, + { 0x71, 0xFF, prt, "out (c),0", INSS_Z80 }, + { 0x70, 0xFF, dump, "xx", INSS_ALL }, + { 0x41, 0xC7, prt_r, "out (bc),%s", INSS_EZ80 }, + { 0x41, 0xC7, prt_r, "out (c),%s", INSS_ALL }, + { 0x42, 0xCF, prt_rr, "sbc hl,", INSS_ALL }, + { 0x43, 0xCF, prt_rr_nn, "ld (0x%%04x),%s", INSS_ALL }, + { 0x44, 0xFF, prt, "neg", INSS_ALL }, + { 0x45, 0xFF, prt, "retn", INSS_ALL }, + { 0x46, 0xFF, prt, "im 0", INSS_ALL }, + { 0x47, 0xFF, prt, "ld i,a", INSS_ALL }, + { 0x4A, 0xCF, prt_rr, "adc hl,", INSS_ALL }, + { 0x4B, 0xCF, prt_rr_nn, "ld %s,(0x%%04x)", INSS_ALL }, + { 0x4C, 0xCF, prt_rr, "mlt ", INSS_Z180|INSS_EZ80 }, + { 0x4D, 0xFF, prt, "reti", INSS_ALL }, + { 0x4F, 0xFF, prt, "ld r,a", INSS_ALL }, + { 0x54, 0xFF, prt_d, "lea ix,iy%+d", INSS_EZ80 }, + { 0x55, 0xFF, prt_d, "lea iy,ix%+d", INSS_EZ80 }, + { 0x56, 0xFF, prt, "im 1", INSS_ALL }, + { 0x57, 0xFF, prt, "ld a,i", INSS_ALL }, + { 0x5E, 0xFF, prt, "im 2", INSS_ALL }, + { 0x5F, 0xFF, prt, "ld a,r", INSS_ALL }, + { 0x64, 0xFF, prt_n, "tst 0x%02x", INSS_Z180 }, + { 0x64, 0xFF, prt_n, "tst a,0x%02x", INSS_EZ80 }, + { 0x65, 0xFF, prt_d, "pea ix%+d", INSS_EZ80 }, + { 0x66, 0xFF, prt_d, "pea iy%+d", INSS_EZ80 }, + { 0x67, 0xFF, prt, "rrd", INSS_ALL }, + { 0x6F, 0xFF, prt, "rld", INSS_ALL }, + { 0x74, 0xFF, prt_n, "tstio 0x%02x", INSS_Z180|INSS_EZ80 }, + { 0x76, 0xFF, prt, "slp", INSS_Z180|INSS_EZ80 }, + { 0x82, 0xE6, cism, "", INSS_Z180|INSS_EZ80 }, + { 0x84, 0xC7, cis2, "", INSS_EZ80 }, + { 0xA0, 0xE4, cis, "", INSS_ALL }, + { 0x7D, 0xFF, prt, "stmix", INSS_EZ80 }, + { 0x7E, 0xFF, prt, "rsmix", INSS_EZ80 }, + { 0x6D, 0xFF, prt, "ld mb,a", INSS_EZ80 }, + { 0x6E, 0xFF, prt, "ld a,mb", INSS_EZ80 }, + { 0xC7, 0xFF, prt, "ld i,hl", INSS_EZ80 }, + { 0xD7, 0xFF, prt, "ld hl,i", INSS_EZ80 }, + { 0xC2, 0xFF, prt, "inirx", INSS_EZ80 }, + { 0xC3, 0xFF, prt, "otirx", INSS_EZ80 }, + { 0xCA, 0xFF, prt, "indrx", INSS_EZ80 }, + { 0xCB, 0xFF, prt, "otdrx", INSS_EZ80 }, + { 0xC3, 0xFF, prt, "muluw hl,bc", INSS_R800 }, + { 0xC5, 0xE7, prt_r, "mulub a,%s", INSS_R800 }, + { 0xF3, 0xFF, prt, "muluw hl,sp", INSS_R800 }, + { 0x00, 0x00, dump, "xx", INSS_ALL } }; static int -pref_ed (struct buffer * buf, disassemble_info * info, - char* txt ATTRIBUTE_UNUSED) +pref_ed (struct buffer *buf, disassemble_info *info, + const char *txt ATTRIBUTE_UNUSED) { struct tab_elt *p; if (fetch_data(buf, info, 1)) { - for (p = opc_ed; p->val != (buf->data[1] & p->mask); ++p) - ; + for (p = opc_ed; p->val != (buf->data[1] & p->mask) || !mach_inst(buf, p); ++p) + ; p->fp (buf, info, p->text); } else @@ -340,16 +491,25 @@ static char *cb2_str[] = }; static int -pref_cb (struct buffer * buf, disassemble_info * info, - char* txt ATTRIBUTE_UNUSED) +pref_cb (struct buffer *buf, disassemble_info *info, + const char *txt ATTRIBUTE_UNUSED) { + const char *op_txt; + int idx; if (fetch_data (buf, info, 1)) { buf->n_used = 2; if ((buf->data[1] & 0xc0) == 0) - info->fprintf_func (info->stream, "%s %s", - cb2_str[(buf->data[1] >> 3) & 7], - r_str[buf->data[1] & 7]); + { + idx = (buf->data[1] >> 3) & 7; + if ((buf->inss & INSS_GBZ80) && (idx == 6)) + op_txt = "swap"; + else + op_txt = cb2_str[idx]; + info->fprintf_func (info->stream, "%s %s", + op_txt, + r_str[buf->data[1] & 7]); + } else info->fprintf_func (info->stream, "%s %d,%s", cb1_str[(buf->data[1] >> 6) & 3], @@ -363,7 +523,7 @@ pref_cb (struct buffer * buf, disassemble_info * info, } static int -addvv (struct buffer * buf, disassemble_info * info, char* txt) +addvv (struct buffer * buf, disassemble_info * info, const char *txt) { info->fprintf_func (info->stream, "add %s,%s", txt, txt); @@ -371,7 +531,7 @@ addvv (struct buffer * buf, disassemble_info * info, char* txt) } static int -ld_v_v (struct buffer * buf, disassemble_info * info, char* txt) +ld_v_v (struct buffer * buf, disassemble_info * info, const char *txt) { char mytxt[TXTSIZ]; @@ -380,8 +540,9 @@ ld_v_v (struct buffer * buf, disassemble_info * info, char* txt) } static int -prt_d (struct buffer *buf, disassemble_info * info, char *txt) +prt_d_n (struct buffer *buf, disassemble_info * info, const char *txt) { + char mytxt[TXTSIZ]; int d; signed char *p; @@ -390,8 +551,8 @@ prt_d (struct buffer *buf, disassemble_info * info, char *txt) if (fetch_data (buf, info, 1)) { d = p[0]; - info->fprintf_func (info->stream, txt, d); - buf->n_used = buf->n_fetch; + snprintf (mytxt, TXTSIZ, txt, d); + return prt_n (buf, info, mytxt); } else buf->n_used = -1; @@ -400,61 +561,58 @@ prt_d (struct buffer *buf, disassemble_info * info, char *txt) } static int -prt_d_n (struct buffer *buf, disassemble_info * info, char *txt) +arit_d (struct buffer *buf, disassemble_info * info, const char *txt) { char mytxt[TXTSIZ]; - int d; - signed char *p; - - p = buf->data + buf->n_fetch; - - if (fetch_data (buf, info, 1)) - { - d = p[0]; - snprintf (mytxt, TXTSIZ, txt, d); - return prt_n (buf, info, mytxt); - } - else - buf->n_used = -1; + signed char c; + const char * const *arit; - return buf->n_used; + arit = (buf->inss & INSS_EZ80) ? arit_str_ez80 : arit_str; + c = buf->data[buf->n_fetch - 1]; + snprintf (mytxt, TXTSIZ, txt, arit[(c >> 3) & 7]); + return prt_d (buf, info, mytxt); } static int -arit_d (struct buffer *buf, disassemble_info * info, char *txt) +ld_r_d (struct buffer *buf, disassemble_info * info, const char *txt) { char mytxt[TXTSIZ]; signed char c; c = buf->data[buf->n_fetch - 1]; - snprintf (mytxt, TXTSIZ, txt, arit_str[(c >> 3) & 7]); + snprintf (mytxt, TXTSIZ, txt, r_str[(c >> 3) & 7]); return prt_d (buf, info, mytxt); } static int -ld_r_d (struct buffer *buf, disassemble_info * info, char *txt) +ld_d_r(struct buffer *buf, disassemble_info * info, const char *txt) { char mytxt[TXTSIZ]; signed char c; c = buf->data[buf->n_fetch - 1]; - snprintf (mytxt, TXTSIZ, txt, r_str[(c >> 3) & 7]); + snprintf (mytxt, TXTSIZ, txt, r_str[c & 7]); return prt_d (buf, info, mytxt); } static int -ld_d_r(struct buffer *buf, disassemble_info * info, char *txt) +ld_ii_ii(struct buffer *buf, disassemble_info * info, const char *txt) { char mytxt[TXTSIZ]; signed char c; + int p; + static const char *ii[2] = { "ix", "iy" }; + p = (buf->data[buf->n_fetch - 2] == '\xdd') ? 0 : 1; c = buf->data[buf->n_fetch - 1]; - snprintf (mytxt, TXTSIZ, txt, r_str[c & 7]); + if ((c & 0x07) != 0x07) + p = 1 - p; /* 0 -> 1, 1 -> 0 */ + snprintf (mytxt, TXTSIZ, txt, ii[p]); return prt_d (buf, info, mytxt); } static int -pref_xd_cb (struct buffer * buf, disassemble_info * info, char* txt) +pref_xd_cb (struct buffer * buf, disassemble_info * info, const char *txt) { if (fetch_data (buf, info, 2)) { @@ -490,49 +648,58 @@ pref_xd_cb (struct buffer * buf, disassemble_info * info, char* txt) /* Table to disassemble machine codes with prefix 0xDD or 0xFD. */ static struct tab_elt opc_ind[] = { - { 0x24, 0xF7, prt_r, "inc %s%%s" }, - { 0x25, 0xF7, prt_r, "dec %s%%s" }, - { 0x26, 0xF7, ld_r_n, "ld %s%%s,0x%%%%02x" }, - { 0x21, 0xFF, prt_nn, "ld %s,0x%%04x" }, - { 0x22, 0xFF, prt_nn, "ld (0x%%04x),%s" }, - { 0x2A, 0xFF, prt_nn, "ld %s,(0x%%04x)" }, - { 0x23, 0xFF, prt, "inc %s" }, - { 0x2B, 0xFF, prt, "dec %s" }, - { 0x29, 0xFF, addvv, "%s" }, - { 0x09, 0xCF, prt_rr, "add %s," }, - { 0x34, 0xFF, prt_d, "inc (%s%%+d)" }, - { 0x35, 0xFF, prt_d, "dec (%s%%+d)" }, - { 0x36, 0xFF, prt_d_n, "ld (%s%%+d),0x%%%%02x" }, - - { 0x76, 0xFF, dump, "h" }, - { 0x46, 0xC7, ld_r_d, "ld %%s,(%s%%%%+d)" }, - { 0x70, 0xF8, ld_d_r, "ld (%s%%%%+d),%%s" }, - { 0x64, 0xF6, ld_v_v, "%s" }, - { 0x60, 0xF0, ld_r_r, "ld %s%%s,%%s" }, - { 0x44, 0xC6, ld_r_r, "ld %%s,%s%%s" }, - - { 0x86, 0xC7, arit_d, "%%s(%s%%%%+d)" }, - { 0x84, 0xC6, arit_r, "%%s%s%%s" }, - - { 0xE1, 0xFF, prt, "pop %s" }, - { 0xE5, 0xFF, prt, "push %s" }, - { 0xCB, 0xFF, pref_xd_cb, "%s" }, - { 0xE3, 0xFF, prt, "ex (sp),%s" }, - { 0xE9, 0xFF, prt, "jp (%s)" }, - { 0xF9, 0xFF, prt, "ld sp,%s" }, - { 0x00, 0x00, dump, "?" }, + { 0x07, 0xFF, prt_d, "ld bc,(%s%%+d)", INSS_EZ80 }, + { 0x0F, 0xFF, prt_d, "ld (%s%%+d),bc", INSS_EZ80 }, + { 0x17, 0xFF, prt_d, "ld de,(%s%%+d)", INSS_EZ80 }, + { 0x1F, 0xFF, prt_d, "ld (%s%%+d),de", INSS_EZ80 }, + { 0x24, 0xF7, prt_r, "inc %s%%s", INSS_ALL }, + { 0x25, 0xF7, prt_r, "dec %s%%s", INSS_ALL }, + { 0x26, 0xF7, ld_r_n, "ld %s%%s,0x%%%%02x", INSS_ALL }, + { 0x27, 0xFF, prt_d, "ld hl,(%s%%+d)", INSS_EZ80 }, + { 0x2F, 0xFF, prt_d, "ld (%s%%+d),hl", INSS_EZ80 }, + { 0x21, 0xFF, prt_nn, "ld %s,0x%%04x", INSS_ALL }, + { 0x22, 0xFF, prt_nn, "ld (0x%%04x),%s", INSS_ALL }, + { 0x2A, 0xFF, prt_nn, "ld %s,(0x%%04x)", INSS_ALL }, + { 0x23, 0xFF, prt, "inc %s", INSS_ALL }, + { 0x2B, 0xFF, prt, "dec %s", INSS_ALL }, + { 0x29, 0xFF, addvv, "%s", INSS_ALL }, + { 0x31, 0xFF, ld_ii_ii, "ld %%s,(%s%%%%+d)", INSS_EZ80 }, + { 0x37, 0xFF, ld_ii_ii, "ld %%s,(%s%%%%+d)", INSS_EZ80 }, + { 0x3E, 0xFE, ld_ii_ii, "ld (%s%%%%+d),%%s", INSS_EZ80 }, + { 0x09, 0xCF, prt_rr, "add %s,", INSS_ALL }, + { 0x34, 0xFF, prt_d, "inc (%s%%+d)", INSS_ALL }, + { 0x35, 0xFF, prt_d, "dec (%s%%+d)", INSS_ALL }, + { 0x36, 0xFF, prt_d_n, "ld (%s%%+d),0x%%%%02x", INSS_ALL }, + + { 0x76, 0xFF, dump, "h", INSS_ALL }, + { 0x46, 0xC7, ld_r_d, "ld %%s,(%s%%%%+d)", INSS_ALL }, + { 0x70, 0xF8, ld_d_r, "ld (%s%%%%+d),%%s", INSS_ALL }, + { 0x64, 0xF6, ld_v_v, "%s", INSS_ALL }, + { 0x60, 0xF0, ld_r_r, "ld %s%%s,%%s", INSS_ALL }, + { 0x44, 0xC6, ld_r_r, "ld %%s,%s%%s", INSS_ALL }, + + { 0x86, 0xC7, arit_d, "%%s(%s%%%%+d)", INSS_ALL }, + { 0x84, 0xC6, arit_r, "%%s%s%%s", INSS_ALL }, + + { 0xE1, 0xFF, prt, "pop %s", INSS_ALL }, + { 0xE5, 0xFF, prt, "push %s", INSS_ALL }, + { 0xCB, 0xFF, pref_xd_cb, "%s", INSS_ALL }, + { 0xE3, 0xFF, prt, "ex (sp),%s", INSS_ALL }, + { 0xE9, 0xFF, prt, "jp (%s)", INSS_ALL }, + { 0xF9, 0xFF, prt, "ld sp,%s", INSS_ALL }, + { 0x00, 0x00, dump, "?", INSS_ALL }, } ; static int -pref_ind (struct buffer * buf, disassemble_info * info, char* txt) +pref_ind (struct buffer *buf, disassemble_info *info, const char *txt) { if (fetch_data (buf, info, 1)) { char mytxt[TXTSIZ]; struct tab_elt *p; - for (p = opc_ind; p->val != (buf->data[1] & p->mask); ++p) - ; + for (p = opc_ind; p->val != (buf->data[1] & p->mask) || !mach_inst (buf, p); ++p) + ; snprintf (mytxt, TXTSIZ, p->text, txt); p->fp (buf, info, mytxt); } @@ -542,85 +709,156 @@ pref_ind (struct buffer * buf, disassemble_info * info, char* txt) return buf->n_used; } +static int +print_insn_z80_buf (struct buffer *buf, disassemble_info *info); + +static int +suffix (struct buffer *buf_in, disassemble_info *info, const char *txt) +{ + struct buffer buf; + char mybuf[TXTSIZ*4]; + fprintf_ftype old_fprintf; + void *old_stream; + char *p; + + buf_in->n_used++; + buf = *buf_in; + buf.n_fetch = 0; + buf.n_used = 0; + buf.base++; + switch (txt[2]) + { + case 'l': /* SIL or LIL */ + buf.nn_len = 3; + break; + case 's': /* SIS or LIS */ + buf.nn_len = 2; + break; + default: + /* unknown suffix */ + return -1; + } + old_fprintf = info->fprintf_func; + old_stream = info->stream; + info->fprintf_func = (fprintf_ftype)&sprintf; + info->stream = mybuf; + print_insn_z80_buf(&buf, info); + info->fprintf_func = old_fprintf; + info->stream = old_stream; + + for (p = &mybuf[0]; *p && *p != ' ' && *p != '.'; ++p) + ; + + if (*p == '.') /* suffix already present */ + { + info->fprintf_func(info->stream, "nop ;%s", txt); /* double prefix */ + return buf_in->n_used; + } + + *p++ = '\0'; + info->fprintf_func(info->stream, *p ? "%s.%s %s" : "%s.%s", mybuf, txt, p); + + memcpy(&buf_in->data[1], buf.data, sizeof(buf.data)-1); + buf_in->n_used += buf.n_used; + buf_in->n_fetch += buf.n_fetch; + return buf_in->n_used; +} + /* Table to disassemble machine codes without prefix. */ static struct tab_elt opc_main[] = { - { 0x00, 0xFF, prt, "nop" }, - { 0x01, 0xCF, prt_rr_nn, "ld %s,0x%%04x" }, - { 0x02, 0xFF, prt, "ld (bc),a" }, - { 0x03, 0xCF, prt_rr, "inc " }, - { 0x04, 0xC7, prt_r, "inc %s" }, - { 0x05, 0xC7, prt_r, "dec %s" }, - { 0x06, 0xC7, ld_r_n, "ld %s,0x%%02x" }, - { 0x07, 0xFF, prt, "rlca" }, - { 0x08, 0xFF, prt, "ex af,af'" }, - { 0x09, 0xCF, prt_rr, "add hl," }, - { 0x0A, 0xFF, prt, "ld a,(bc)" }, - { 0x0B, 0xCF, prt_rr, "dec " }, - { 0x0F, 0xFF, prt, "rrca" }, - { 0x10, 0xFF, prt_e, "djnz " }, - { 0x12, 0xFF, prt, "ld (de),a" }, - { 0x17, 0xFF, prt, "rla" }, - { 0x18, 0xFF, prt_e, "jr "}, - { 0x1A, 0xFF, prt, "ld a,(de)" }, - { 0x1F, 0xFF, prt, "rra" }, - { 0x20, 0xE7, jr_cc, "jr %s,"}, - { 0x22, 0xFF, prt_nn, "ld (0x%04x),hl" }, - { 0x27, 0xFF, prt, "daa"}, - { 0x2A, 0xFF, prt_nn, "ld hl,(0x%04x)" }, - { 0x2F, 0xFF, prt, "cpl" }, - { 0x32, 0xFF, prt_nn, "ld (0x%04x),a" }, - { 0x37, 0xFF, prt, "scf" }, - { 0x3A, 0xFF, prt_nn, "ld a,(0x%04x)" }, - { 0x3F, 0xFF, prt, "ccf" }, - - { 0x76, 0xFF, prt, "halt" }, - { 0x40, 0xC0, ld_r_r, "ld %s,%s"}, - - { 0x80, 0xC0, arit_r, "%s%s" }, - - { 0xC0, 0xC7, prt_cc, "ret " }, - { 0xC1, 0xCF, pop_rr, "pop" }, - { 0xC2, 0xC7, jp_cc_nn, "jp " }, - { 0xC3, 0xFF, prt_nn, "jp 0x%04x" }, - { 0xC4, 0xC7, jp_cc_nn, "call " }, - { 0xC5, 0xCF, pop_rr, "push" }, - { 0xC6, 0xC7, arit_n, "%s0x%%02x" }, - { 0xC7, 0xC7, rst, "rst 0x%02x" }, - { 0xC9, 0xFF, prt, "ret" }, - { 0xCB, 0xFF, pref_cb, "" }, - { 0xCD, 0xFF, prt_nn, "call 0x%04x" }, - { 0xD3, 0xFF, prt_n, "out (0x%02x),a" }, - { 0xD9, 0xFF, prt, "exx" }, - { 0xDB, 0xFF, prt_n, "in a,(0x%02x)" }, - { 0xDD, 0xFF, pref_ind, "ix" }, - { 0xE3, 0xFF, prt, "ex (sp),hl" }, - { 0xE9, 0xFF, prt, "jp (hl)" }, - { 0xEB, 0xFF, prt, "ex de,hl" }, - { 0xED, 0xFF, pref_ed, ""}, - { 0xF3, 0xFF, prt, "di" }, - { 0xF9, 0xFF, prt, "ld sp,hl" }, - { 0xFB, 0xFF, prt, "ei" }, - { 0xFD, 0xFF, pref_ind, "iy" }, - { 0x00, 0x00, prt, "????" }, + { 0x00, 0xFF, prt, "nop", INSS_ALL }, + { 0x01, 0xCF, prt_rr_nn, "ld %s,0x%%04x", INSS_ALL }, + { 0x02, 0xFF, prt, "ld (bc),a", INSS_ALL }, + { 0x03, 0xCF, prt_rr, "inc ", INSS_ALL }, + { 0x04, 0xC7, prt_r, "inc %s", INSS_ALL }, + { 0x05, 0xC7, prt_r, "dec %s", INSS_ALL }, + { 0x06, 0xC7, ld_r_n, "ld %s,0x%%02x", INSS_ALL }, + { 0x07, 0xFF, prt, "rlca", INSS_ALL }, + { 0x08, 0xFF, prt, "ex af,af'", ~INSS_GBZ80 }, + { 0x09, 0xCF, prt_rr, "add hl,", INSS_ALL }, + { 0x0A, 0xFF, prt, "ld a,(bc)", INSS_ALL }, + { 0x0B, 0xCF, prt_rr, "dec ", INSS_ALL }, + { 0x0F, 0xFF, prt, "rrca", INSS_ALL }, + { 0x10, 0xFF, prt_e, "djnz ", ~INSS_GBZ80 }, + { 0x12, 0xFF, prt, "ld (de),a", INSS_ALL }, + { 0x17, 0xFF, prt, "rla", INSS_ALL }, + { 0x18, 0xFF, prt_e, "jr ", INSS_ALL }, + { 0x1A, 0xFF, prt, "ld a,(de)", INSS_ALL }, + { 0x1F, 0xFF, prt, "rra", INSS_ALL }, + { 0x20, 0xE7, jr_cc, "jr %s,", INSS_ALL }, + { 0x22, 0xFF, prt_nn, "ld (0x%04x),hl", ~INSS_GBZ80 }, + { 0x27, 0xFF, prt, "daa", INSS_ALL }, + { 0x2A, 0xFF, prt_nn, "ld hl,(0x%04x)", ~INSS_GBZ80 }, + { 0x2F, 0xFF, prt, "cpl", INSS_ALL }, + { 0x32, 0xFF, prt_nn, "ld (0x%04x),a", INSS_ALL }, + { 0x37, 0xFF, prt, "scf", INSS_ALL }, + { 0x3A, 0xFF, prt_nn, "ld a,(0x%04x)", INSS_ALL }, + { 0x3F, 0xFF, prt, "ccf", INSS_ALL }, + + { 0x76, 0xFF, prt, "halt", INSS_ALL }, + + { 0x40, 0xFF, suffix, "sis", INSS_EZ80 }, + { 0x49, 0xFF, suffix, "lis", INSS_EZ80 }, + { 0x52, 0xFF, suffix, "sil", INSS_EZ80 }, + { 0x5B, 0xFF, suffix, "lil", INSS_EZ80 }, + + { 0x40, 0xC0, ld_r_r, "ld %s,%s", INSS_ALL}, + + { 0x80, 0xC0, arit_r, "%s%s", INSS_ALL }, + + { 0xC0, 0xC7, prt_cc, "ret ", INSS_ALL }, + { 0xC1, 0xCF, pop_rr, "pop", INSS_ALL }, + { 0xC2, 0xC7, jp_cc_nn, "jp ", INSS_ALL }, + { 0xC3, 0xFF, prt_nn, "jp 0x%04x", INSS_ALL }, + { 0xC4, 0xC7, jp_cc_nn, "call ", INSS_ALL }, + { 0xC5, 0xCF, pop_rr, "push", INSS_ALL }, + { 0xC6, 0xC7, arit_n, "%s0x%%02x", INSS_ALL }, + { 0xC7, 0xC7, rst, "rst 0x%02x", INSS_ALL }, + { 0xC9, 0xFF, prt, "ret", INSS_ALL }, + { 0xCB, 0xFF, pref_cb, "", INSS_ALL }, + { 0xCD, 0xFF, prt_nn, "call 0x%04x", INSS_ALL }, + { 0xD3, 0xFF, prt_n, "out (0x%02x),a", ~INSS_GBZ80 }, + { 0xD9, 0xFF, prt, "exx", ~INSS_GBZ80 }, + { 0xDB, 0xFF, prt_n, "in a,(0x%02x)", ~INSS_GBZ80 }, + { 0xDD, 0xFF, pref_ind, "ix", ~INSS_GBZ80 }, + { 0xE3, 0xFF, prt, "ex (sp),hl", ~INSS_GBZ80 }, + { 0xE9, 0xFF, prt, "jp (hl)", INSS_ALL }, + { 0xEB, 0xFF, prt, "ex de,hl", ~INSS_GBZ80 }, + { 0xED, 0xFF, pref_ed, "", ~INSS_GBZ80 }, + { 0xF3, 0xFF, prt, "di", INSS_ALL }, + { 0xF9, 0xFF, prt, "ld sp,hl", ~INSS_GBZ80 }, + { 0xFB, 0xFF, prt, "ei", INSS_ALL }, + { 0xFD, 0xFF, pref_ind, "iy", ~INSS_GBZ80 }, + { 0x00, 0x00, prt, "????", INSS_ALL }, } ; int print_insn_z80 (bfd_vma addr, disassemble_info * info) { struct buffer buf; - struct tab_elt *p; buf.base = addr; buf.n_fetch = 0; buf.n_used = 0; + buf.inss = 1 << info->mach; + buf.nn_len = info->mach == bfd_mach_ez80_adl ? 3 : 2; + info->bytes_per_line = (buf.inss & INSS_EZ80) ? 6 : 4; /* <ss pp oo nn mm MM> OR <pp oo nn mm> */ - if (! fetch_data (& buf, info, 1)) + return print_insn_z80_buf (&buf, info); +} + +static int +print_insn_z80_buf (struct buffer *buf, disassemble_info *info) +{ + struct tab_elt *p; + + if (! fetch_data (buf, info, 1)) return -1; - for (p = opc_main; p->val != (buf.data[0] & p->mask); ++p) + for (p = opc_main; p->val != (buf->data[0] & p->mask) || !mach_inst(buf, p); ++p) ; - p->fp (& buf, info, p->text); + p->fp (buf, info, p->text); - return buf.n_used; + return buf->n_used; } |