[binutils-gdb] Fix a small set of Z80 problems.
Nick Clifton
nickc@sourceware.org
Tue Mar 17 16:56:18 GMT 2020
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=68e52bc7ecfbfdc8d5f85716a8ac7668e211f360
commit 68e52bc7ecfbfdc8d5f85716a8ac7668e211f360
Author: Sergey Belyashov <sergey.belyashov@gmail.com>
Date: Tue Mar 17 16:55:32 2020 +0000
Fix a small set of Z80 problems.
PR 25641
PR 25668
PR 25633
gas Fix disassembling ED+A4/AC/B4/BC opcodes.
Fix assembling lines containing colonless label and instruction
with first operand inside parentheses.
Fix registration of unsupported by target CPU registers.
* config/tc-z80.c: See above.
* config/tc-z80.h: See above.
* testsuite/gas/z80/colonless.d: Update test.
* testsuite/gas/z80/colonless.s: Likewise.
* testsuite/gas/z80/ez80_adl_all.d: Likewise.
* testsuite/gas/z80/ez80_unsup_regs.d: Likewise.
* testsuite/gas/z80/ez80_z80_all.d: Likewise.
* testsuite/gas/z80/gbz80_unsup_regs.d: Likewise.
* testsuite/gas/z80/r800_unsup_regs.d: Likewise.
* testsuite/gas/z80/unsup_regs.s: Likewise.
* testsuite/gas/z80/z180_unsup_regs.d: Likewise.
* testsuite/gas/z80/z80.exp: Likewise.
* testsuite/gas/z80/z80_strict_unsup_regs.d: Likewise.
* testsuite/gas/z80/z80_unsup_regs.d: Likewise.
* testsuite/gas/z80/z80n_unsup_regs.d: Likewise.
opcodes * z80-dis.c: Fix disassembling ED+A4/AC/B4/BC opcodes.
Diff:
---
gas/config/tc-z80.c | 131 ++++++++++++++------------
gas/config/tc-z80.h | 3 +
gas/testsuite/gas/z80/colonless.d | 12 ++-
gas/testsuite/gas/z80/colonless.s | 4 +
gas/testsuite/gas/z80/ez80_adl_all.d | 8 +-
gas/testsuite/gas/z80/ez80_unsup_regs.d | 34 +++++++
gas/testsuite/gas/z80/ez80_z80_all.d | 8 +-
gas/testsuite/gas/z80/gbz80_unsup_regs.d | 45 +++++++++
gas/testsuite/gas/z80/r800_unsup_regs.d | 35 +++++++
gas/testsuite/gas/z80/unsup_regs.s | 71 ++++++++++++++
gas/testsuite/gas/z80/z180_unsup_regs.d | 39 ++++++++
gas/testsuite/gas/z80/z80.exp | 87 +----------------
gas/testsuite/gas/z80/z80_strict_unsup_regs.d | 39 ++++++++
gas/testsuite/gas/z80/z80_unsup_regs.d | 34 +++++++
gas/testsuite/gas/z80/z80n_unsup_regs.d | 34 +++++++
opcodes/z80-dis.c | 27 ++----
16 files changed, 436 insertions(+), 175 deletions(-)
diff --git a/gas/config/tc-z80.c b/gas/config/tc-z80.c
index 713176f76bd..a3ab13de155 100644
--- a/gas/config/tc-z80.c
+++ b/gas/config/tc-z80.c
@@ -155,7 +155,7 @@ struct match_info
static const struct match_info
match_cpu_table [] =
{
- {"z80", INS_Z80, 0, 0, "Zilog Z80 (+infc+xyhl)" },
+ {"z80", INS_Z80, 0, 0, "Zilog Z80" },
{"ez80", INS_EZ80, 0, 0, "Zilog eZ80" },
{"gbz80", INS_GBZ80, INS_UNDOC|INS_UNPORT, 0, "GameBoy Z80" },
{"r800", INS_R800, INS_UNPORT, 0, "Ascii R800" },
@@ -428,6 +428,7 @@ struct reg_entry
{
const char* name;
int number;
+ int isa;
};
#define R_STACKABLE (0x80)
#define R_ARITH (0x40)
@@ -457,28 +458,28 @@ struct reg_entry
static const struct reg_entry regtable[] =
{
- {"a", REG_A },
- {"af", REG_AF },
- {"b", REG_B },
- {"bc", REG_BC },
- {"c", REG_C },
- {"d", REG_D },
- {"de", REG_DE },
- {"e", REG_E },
- {"f", REG_F },
- {"h", REG_H },
- {"hl", REG_HL },
- {"i", REG_I },
- {"ix", REG_IX },
- {"ixh",REG_H | R_IX },
- {"ixl",REG_L | R_IX },
- {"iy", REG_IY },
- {"iyh",REG_H | R_IY },
- {"iyl",REG_L | R_IY },
- {"l", REG_L },
- {"mb", REG_MB },
- {"r", REG_R },
- {"sp", REG_SP },
+ {"a", REG_A, INS_ALL },
+ {"af", REG_AF, INS_ALL },
+ {"b", REG_B, INS_ALL },
+ {"bc", REG_BC, INS_ALL },
+ {"c", REG_C, INS_ALL },
+ {"d", REG_D, INS_ALL },
+ {"de", REG_DE, INS_ALL },
+ {"e", REG_E, INS_ALL },
+ {"f", REG_F, INS_IN_F_C | INS_Z80N | INS_R800 },
+ {"h", REG_H, INS_ALL },
+ {"hl", REG_HL, INS_ALL },
+ {"i", REG_I, INS_NOT_GBZ80 },
+ {"ix", REG_IX, INS_NOT_GBZ80 },
+ {"ixh", REG_H | R_IX, INS_IDX_HALF | INS_EZ80 | INS_R800 | INS_Z80N },
+ {"ixl", REG_L | R_IX, INS_IDX_HALF | INS_EZ80 | INS_R800 | INS_Z80N },
+ {"iy", REG_IY, INS_NOT_GBZ80 },
+ {"iyh", REG_H | R_IY, INS_IDX_HALF | INS_EZ80 | INS_R800 | INS_Z80N },
+ {"iyl", REG_L | R_IY, INS_IDX_HALF | INS_EZ80 | INS_R800 | INS_Z80N },
+ {"l", REG_L, INS_ALL },
+ {"mb", REG_MB, INS_EZ80 },
+ {"r", REG_R, INS_NOT_GBZ80 },
+ {"sp", REG_SP, INS_ALL },
} ;
#define BUFLEN 8 /* Large enough for any keyword. */
@@ -499,6 +500,8 @@ md_begin (void)
reg.X_add_symbol = reg.X_op_symbol = 0;
for ( i = 0 ; i < ARRAY_SIZE ( regtable ) ; ++i )
{
+ if (regtable[i].isa && !(regtable[i].isa & ins_ok))
+ continue;
reg.X_add_number = regtable[i].number;
k = strlen ( regtable[i].name );
buf[k] = 0;
@@ -615,7 +618,7 @@ z80_start_line_hook (void)
break;
}
}
- /* Check for <label>[:] [.](EQU|DEFL) <value>. */
+ /* Check for <label>[:] =|([.](EQU|DEFL)) <value>. */
if (is_name_beginner (*input_line_pointer))
{
char *name;
@@ -625,20 +628,9 @@ z80_start_line_hook (void)
line_start = input_line_pointer;
if (ignore_input ())
return 0;
-
c = get_symbol_name (&name);
rest = input_line_pointer + 1;
-
- if (ISSPACE (c) && colonless_labels)
- {
- if (c == '\n')
- {
- bump_line_counters ();
- LISTING_NEWLINE ();
- }
- c = ':';
- }
- if (*rest == ':')
+ if (c == ':' && *rest == ':')
{
/* remove second colon if SDCC compatibility enabled */
if (sdcc_compat)
@@ -646,15 +638,20 @@ z80_start_line_hook (void)
++rest;
}
rest = (char*)skip_space (rest);
- if (*rest == '.')
- ++rest;
- if (strncasecmp (rest, "EQU", 3) == 0)
- len = 3;
- else if (strncasecmp (rest, "DEFL", 4) == 0)
- len = 4;
+ if (*rest == '=')
+ len = (rest[1] == '=') ? 2 : 1;
else
- len = 0;
- if (len && (!ISALPHA (rest[len])))
+ {
+ if (*rest == '.')
+ ++rest;
+ if (strncasecmp (rest, "EQU", 3) == 0)
+ len = 3;
+ else if (strncasecmp (rest, "DEFL", 4) == 0)
+ len = 4;
+ else
+ len = 0;
+ }
+ if (len && (len <= 2 || !ISALPHA (rest[len])))
{
/* Handle assignment here. */
if (line_start[-1] == '\n')
@@ -664,7 +661,17 @@ z80_start_line_hook (void)
}
input_line_pointer = rest + len - 1;
/* Allow redefining with "DEFL" (len == 4), but not with "EQU". */
- equals (name, len == 4);
+ switch (len)
+ {
+ case 1: /* label = expr */
+ case 4: /* label DEFL expr */
+ equals (name, 1);
+ break;
+ case 2: /* label == expr */
+ case 3: /* label EQU expr */
+ equals (name, 0);
+ break;
+ }
return 1;
}
else
@@ -1011,20 +1018,20 @@ parse_exp (const char *s, expressionS *op)
/* Condition codes, including some synonyms provided by HiTech zas. */
static const struct reg_entry cc_tab[] =
{
- { "age", 6 << 3 },
- { "alt", 7 << 3 },
- { "c", 3 << 3 },
- { "di", 4 << 3 },
- { "ei", 5 << 3 },
- { "lge", 2 << 3 },
- { "llt", 3 << 3 },
- { "m", 7 << 3 },
- { "nc", 2 << 3 },
- { "nz", 0 << 3 },
- { "p", 6 << 3 },
- { "pe", 5 << 3 },
- { "po", 4 << 3 },
- { "z", 1 << 3 },
+ { "age", 6 << 3, INS_ALL },
+ { "alt", 7 << 3, INS_ALL },
+ { "c", 3 << 3, INS_ALL },
+ { "di", 4 << 3, INS_ALL },
+ { "ei", 5 << 3, INS_ALL },
+ { "lge", 2 << 3, INS_ALL },
+ { "llt", 3 << 3, INS_ALL },
+ { "m", 7 << 3, INS_ALL },
+ { "nc", 2 << 3, INS_ALL },
+ { "nz", 0 << 3, INS_ALL },
+ { "p", 6 << 3, INS_ALL },
+ { "pe", 5 << 3, INS_ALL },
+ { "po", 4 << 3, INS_ALL },
+ { "z", 1 << 3, INS_ALL },
} ;
/* Parse condition code. */
@@ -3811,6 +3818,12 @@ tc_gen_reloc (asection *seg ATTRIBUTE_UNUSED , fixS *fixp)
return reloc;
}
+int
+z80_tc_labels_without_colon (void)
+{
+ return colonless_labels;
+}
+
int
z80_tc_label_is_local (const char *name)
{
diff --git a/gas/config/tc-z80.h b/gas/config/tc-z80.h
index d169d09946e..7fd7c9e3523 100644
--- a/gas/config/tc-z80.h
+++ b/gas/config/tc-z80.h
@@ -96,6 +96,9 @@ extern void z80_cons_fix_new (fragS *, int, int, expressionS *);
well, but it is cleaner to handle that in tc-z80.c. */
#define SINGLE_QUOTE_STRINGS
+#define LABELS_WITHOUT_COLONS (z80_tc_labels_without_colon())
+extern int z80_tc_labels_without_colon (void);
+
/* An `.lcomm' directive with no explicit alignment parameter will
use this macro to set P2VAR to the alignment that a request for
SIZE bytes will have. The alignment is expressed as a power of
diff --git a/gas/testsuite/gas/z80/colonless.d b/gas/testsuite/gas/z80/colonless.d
index a8af8ca1abc..3fe8d379897 100644
--- a/gas/testsuite/gas/z80/colonless.d
+++ b/gas/testsuite/gas/z80/colonless.d
@@ -7,9 +7,9 @@
Disassembly of section \.text:
-00000000 <start>:
+0+0 <start>:
[ ]+0:[ ]+3e 00[ ]+ld a,0x00
-[ ]+2:[ ]+28 0c[ ]+jr z,0x0010
+[ ]+2:[ ]+28 0d[ ]+jr z,0x0011
[ ]+4:[ ]+3e 01[ ]+ld a,0x01
[ ]+6:[ ]+3e 02[ ]+ld a,0x02
[ ]+8:[ ]+3e 03[ ]+ld a,0x03
@@ -17,5 +17,9 @@ Disassembly of section \.text:
[ ]+c:[ ]+18 f4[ ]+jr 0x0002
[ ]+e:[ ]+18 f6[ ]+jr 0x0006
-00000010 <finish>:
-[ ]+10:[ ]+c9[ ]+ret
+0+10 <label>:
+[ ]+10:[ ]+e9[ ]+jp \(hl\)
+
+0+11 <finish>:
+[ ]+11:[ ]+c9[ ]+ret
+#pass
diff --git a/gas/testsuite/gas/z80/colonless.s b/gas/testsuite/gas/z80/colonless.s
index 55410f8ed57..58b3e3302d9 100644
--- a/gas/testsuite/gas/z80/colonless.s
+++ b/gas/testsuite/gas/z80/colonless.s
@@ -10,5 +10,9 @@ start
jr start
jr .L_next
jr .L_xx
+label jp (hl)
finish ret
+temp = 1234
+temp .defl 4321
+temp1 equ 4247
.end
diff --git a/gas/testsuite/gas/z80/ez80_adl_all.d b/gas/testsuite/gas/z80/ez80_adl_all.d
index 1ed35d2849d..44f920b91bf 100644
--- a/gas/testsuite/gas/z80/ez80_adl_all.d
+++ b/gas/testsuite/gas/z80/ez80_adl_all.d
@@ -147,12 +147,12 @@ Disassembly of section .text:
\s+124:\s+ed 8c\s+ind2
\s+126:\s+ed 92\s+inimr
\s+128:\s+ed 93\s+otimr
-\s+12a:\s+ed 94\s+oti2r
+\s+12a:\s+ed 94\s+ini2r
\s+12c:\s+ed 9a\s+indmr
\s+12e:\s+ed 9b\s+otdmr
-\s+130:\s+ed 9c\s+otd2r
-\s+132:\s+ed a4\s+ini2
-\s+134:\s+ed ac\s+ind2
+\s+130:\s+ed 9c\s+ind2r
+\s+132:\s+ed a4\s+outi2
+\s+134:\s+ed ac\s+outd2
\s+136:\s+ed b4\s+oti2r
\s+138:\s+ed bc\s+otd2r
\s+13a:\s+ed c2\s+inirx
diff --git a/gas/testsuite/gas/z80/ez80_unsup_regs.d b/gas/testsuite/gas/z80/ez80_unsup_regs.d
new file mode 100644
index 00000000000..ad4c8e3ab0d
--- /dev/null
+++ b/gas/testsuite/gas/z80/ez80_unsup_regs.d
@@ -0,0 +1,34 @@
+#name: eZ80 use unsupported registers as labels
+#as: -march=ez80 --defsym NO_REG_F= --defsym=EZ80=
+#objdump: -d
+#source: unsup_regs.s
+
+.*: .*
+
+Disassembly of section \.text:
+
+0+00 <_start>:
+[ ]+0:[ ]+dd 7d[ ]+ld a,ixl
+[ ]+2:[ ]+dd 67[ ]+ld ixh,a
+[ ]+4:[ ]+dd 44[ ]+ld b,ixh
+[ ]+6:[ ]+dd 68[ ]+ld ixl,b
+[ ]+8:[ ]+fd 4d[ ]+ld c,iyl
+[ ]+a:[ ]+fd 61[ ]+ld iyh,c
+[ ]+c:[ ]+fd 54[ ]+ld d,iyh
+[ ]+e:[ ]+fd 6a[ ]+ld iyl,d
+
+0+10 <f>:
+[ ]+10:[ ]+3e 10[ ]+ld a,0x10
+[ ]+12:[ ]+dd 29[ ]+add ix,ix
+[ ]+14:[ ]+dd 86 01[ ]+add a,\(ix\+1\)
+[ ]+17:[ ]+dd 21 34 12[ ]+ld ix,0x1234
+[ ]+1b:[ ]+fd 21 21 43[ ]+ld iy,0x4321
+[ ]+1f:[ ]+fd 22 34 12[ ]+ld \(0x1234\),iy
+[ ]+23:[ ]+fd 77 ff[ ]+ld \(iy\-1\),a
+[ ]+26:[ ]+ed 5f[ ]+ld a,r
+[ ]+28:[ ]+ed 4f[ ]+ld r,a
+[ ]+2a:[ ]+ed 57[ ]+ld a,i
+[ ]+2c:[ ]+ed 47[ ]+ld i,a
+[ ]+2e:[ ]+ed 6e[ ]+ld a,mb
+[ ]+30:[ ]+ed 6d[ ]+ld mb,a
+#pass
diff --git a/gas/testsuite/gas/z80/ez80_z80_all.d b/gas/testsuite/gas/z80/ez80_z80_all.d
index 1f9a6f147fc..91cae824664 100644
--- a/gas/testsuite/gas/z80/ez80_z80_all.d
+++ b/gas/testsuite/gas/z80/ez80_z80_all.d
@@ -147,12 +147,12 @@ Disassembly of section .text:
\s+124:\s+ed 8c\s+ind2
\s+126:\s+ed 92\s+inimr
\s+128:\s+ed 93\s+otimr
-\s+12a:\s+ed 94\s+oti2r
+\s+12a:\s+ed 94\s+ini2r
\s+12c:\s+ed 9a\s+indmr
\s+12e:\s+ed 9b\s+otdmr
-\s+130:\s+ed 9c\s+otd2r
-\s+132:\s+ed a4\s+ini2
-\s+134:\s+ed ac\s+ind2
+\s+130:\s+ed 9c\s+ind2r
+\s+132:\s+ed a4\s+outi2
+\s+134:\s+ed ac\s+outd2
\s+136:\s+ed b4\s+oti2r
\s+138:\s+ed bc\s+otd2r
\s+13a:\s+ed c2\s+inirx
diff --git a/gas/testsuite/gas/z80/gbz80_unsup_regs.d b/gas/testsuite/gas/z80/gbz80_unsup_regs.d
new file mode 100644
index 00000000000..f3256cf9f3e
--- /dev/null
+++ b/gas/testsuite/gas/z80/gbz80_unsup_regs.d
@@ -0,0 +1,45 @@
+#name: GBZ80 use unsupported registers as labels
+#as: -march=gbz80 --defsym NO_XYHL= --defsym NO_REG_F= --defsym NO_REG_R= --defsym NO_REG_I= --defsym NO_INDEX=
+#objdump: -d
+#source: unsup_regs.s
+
+.*: .*
+
+Disassembly of section \.text:
+
+0+00 <_start>:
+[ ]+0:[ ]+3e 02[ ]+ld a,0x02
+
+0+02 <ixl>:
+[ ]+2:[ ]+06 04[ ]+ld b,0x04
+
+0+04 <ixh>:
+[ ]+4:[ ]+0e 06[ ]+ld c,0x06
+
+0+06 <iyl>:
+[ ]+6:[ ]+16 08[ ]+ld d,0x08
+
+0+08 <f>:
+[ ]+8:[ ]+3e 08[ ]+ld a,0x08
+
+0+0a <ix>:
+[ ]+a:[ ]+21 0a 00[ ]+ld hl,0x000a
+
+0+0d <iy>:
+[ ]+d:[ ]+01 0d 00[ ]+ld bc,0x000d
+[ ]+10:[ ]+fa 09 00[ ]+ld a,\(0x0009\)
+[ ]+13:[ ]+ea 0e 00[ ]+ld \(0x000e\),a
+
+0+16 <r>:
+[ ]+16:[ ]+3e 16[ ]+ld a,0x16
+[ ]+18:[ ]+ea 16 00[ ]+ld \(0x0016\),a
+
+0+1b <i>:
+[ ]+1b:[ ]+3e 1b[ ]+ld a,0x1b
+[ ]+1d:[ ]+ea 1b 00[ ]+ld \(0x001b\),a
+
+0+20 <mb>:
+[ ]+20:[ ]+21 20 00[ ]+ld hl,0x0020
+[ ]+23:[ ]+3e 20[ ]+ld a,0x20
+[ ]+25:[ ]+ea 20 00[ ]+ld \(0x0020\),a
+#pass
diff --git a/gas/testsuite/gas/z80/r800_unsup_regs.d b/gas/testsuite/gas/z80/r800_unsup_regs.d
new file mode 100644
index 00000000000..133790598c2
--- /dev/null
+++ b/gas/testsuite/gas/z80/r800_unsup_regs.d
@@ -0,0 +1,35 @@
+#name: R800 use unsupported registers as labels
+#as: -march=r800
+#objdump: -d
+#source: unsup_regs.s
+
+.*: .*
+
+Disassembly of section \.text:
+
+0+00 <_start>:
+[ ]+0:[ ]+dd 7d[ ]+ld a,ixl
+[ ]+2:[ ]+dd 67[ ]+ld ixh,a
+[ ]+4:[ ]+dd 44[ ]+ld b,ixh
+[ ]+6:[ ]+dd 68[ ]+ld ixl,b
+[ ]+8:[ ]+fd 4d[ ]+ld c,iyl
+[ ]+a:[ ]+fd 61[ ]+ld iyh,c
+[ ]+c:[ ]+fd 54[ ]+ld d,iyh
+[ ]+e:[ ]+fd 6a[ ]+ld iyl,d
+[ ]+10:[ ]+ed 70[ ]+in f,\(c\)
+[ ]+12:[ ]+dd 29[ ]+add ix,ix
+[ ]+14:[ ]+dd 86 01[ ]+add a,\(ix\+1\)
+[ ]+17:[ ]+dd 21 34 12 ld ix,0x1234
+[ ]+1b:[ ]+fd 21 21 43 ld iy,0x4321
+[ ]+1f:[ ]+fd 22 34 12 ld \(0x1234\),iy
+[ ]+23:[ ]+fd 77 ff[ ]+ld \(iy\-1\),a
+[ ]+26:[ ]+ed 5f[ ]+ld a,r
+[ ]+28:[ ]+ed 4f[ ]+ld r,a
+[ ]+2a:[ ]+ed 57[ ]+ld a,i
+[ ]+2c:[ ]+ed 47[ ]+ld i,a
+
+0+2e <mb>:
+[ ]+2e:[ ]+21 2e 00[ ]+ld hl,0x002e
+[ ]+31:[ ]+3e 2e[ ]+ld a,0x2e
+[ ]+33:[ ]+32 2e 00[ ]+ld \(0x002e\),a
+#pass
diff --git a/gas/testsuite/gas/z80/unsup_regs.s b/gas/testsuite/gas/z80/unsup_regs.s
new file mode 100644
index 00000000000..1b4ef37f0f3
--- /dev/null
+++ b/gas/testsuite/gas/z80/unsup_regs.s
@@ -0,0 +1,71 @@
+ .text
+ .org 0
+_start:
+.ifdef NO_XYHL
+ ld a,ixl
+ixl:
+ ld b,ixh
+ixh:
+ ld c,iyl
+iyl:
+ ld d,iyh
+iyh:
+.else
+ ld a,ixl
+ ld ixh,a
+ ld b,ixh
+ ld ixl,b
+ ld c,iyl
+ ld iyh,c
+ ld d,iyh
+ ld iyl,d
+.endif
+
+.ifdef NO_REG_F
+f: ld a,f
+.else
+ in f,(c)
+.endif
+
+.ifdef NO_INDEX
+ix: ld hl,ix
+iy: ld bc,iy
+ ld a,(ix-1)
+ ld (iy+1),a
+.else
+ add ix,ix
+ add a,(ix+1)
+ ld ix,0x1234
+ ld iy,0x4321
+ ld (0x1234),iy
+ ld (iy-1),a
+.endif
+
+.ifdef NO_REG_R
+r: ld a,r
+ ld (r),a
+.else
+ ld a,r
+ ld r,a
+.endif
+
+.ifdef NO_REG_I
+i: ld a,i
+ ld (i),a
+.else
+ ld a,i
+ ld i,a
+.endif
+
+.ifndef EZ80
+mb: ld hl,mb
+ ld a,mb
+ ld (mb),a
+.else
+ .assume ADL=1
+ ld a,mb
+ ld mb,a
+ .assume ADL=0
+.endif
+
+ .END
diff --git a/gas/testsuite/gas/z80/z180_unsup_regs.d b/gas/testsuite/gas/z80/z180_unsup_regs.d
new file mode 100644
index 00000000000..8c1451b7e66
--- /dev/null
+++ b/gas/testsuite/gas/z80/z180_unsup_regs.d
@@ -0,0 +1,39 @@
+#name: Z180 use unsupported registers as labels
+#as: -march=z180 --defsym NO_REG_F= --defsym NO_XYHL=
+#objdump: -d
+#source: unsup_regs.s
+
+.*: .*
+
+Disassembly of section \.text:
+
+0+00 <_start>:
+[ ]+0:[ ]+3e 02[ ]+ld a,0x02
+
+0+02 <ixl>:
+[ ]+2:[ ]+06 04[ ]+ld b,0x04
+
+0+04 <ixh>:
+[ ]+4:[ ]+0e 06[ ]+ld c,0x06
+
+0+06 <iyl>:
+[ ]+6:[ ]+16 08[ ]+ld d,0x08
+
+0+08 <f>:
+[ ]+8:[ ]+3e 08[ ]+ld a,0x08
+[ ]+a:[ ]+dd 29[ ]+add ix,ix
+[ ]+c:[ ]+dd 86 01[ ]+add a,\(ix\+1\)
+[ ]+f:[ ]+dd 21 34 12 ld ix,0x1234
+[ ]+13:[ ]+fd 21 21 43 ld iy,0x4321
+[ ]+17:[ ]+fd 22 34 12 ld \(0x1234\),iy
+[ ]+1b:[ ]+fd 77 ff[ ]+ld \(iy\-1\),a
+[ ]+1e:[ ]+ed 5f[ ]+ld a,r
+[ ]+20:[ ]+ed 4f[ ]+ld r,a
+[ ]+22:[ ]+ed 57[ ]+ld a,i
+[ ]+24:[ ]+ed 47[ ]+ld i,a
+
+0+26 <mb>:
+[ ]+26:[ ]+21 26 00[ ]+ld hl,0x0026
+[ ]+29:[ ]+3e 26[ ]+ld a,0x26
+[ ]+2b:[ ]+32 26 00[ ]+ld \(0x0026\),a
+#pass
diff --git a/gas/testsuite/gas/z80/z80.exp b/gas/testsuite/gas/z80/z80.exp
index 31f61133b2e..82a7febf736 100644
--- a/gas/testsuite/gas/z80/z80.exp
+++ b/gas/testsuite/gas/z80/z80.exp
@@ -17,93 +17,10 @@
# run tests for target Z80.
if [istarget z80-*-*] then {
-# test redefinitions
- run_dump_test "redef"
-# test .set redefinitions
- run_dump_test "set"
-# test parsing of equ definitions
- run_dump_test "equ"
-# test parsing of " and '
- run_dump_test "quotes"
-# test data definition directives
- run_dump_test "data"
-# test suffixes
- run_dump_test "suffix"
-# test assembling and disassembling instructions involving offsets
- run_dump_test "offset"
+ run_dump_tests [lsort [glob -nocomplain $srcdir/$subdir/*.d]]
+
gas_test_error "jr-forwf.s" "" "relative jump out of range (jr)"
gas_test_error "jr-backf.s" "" "relative jump out of range (jr)"
gas_test_error "djnz-backf.s" "" "relative jump out of range (djnz)"
-
-# test assembling instruction with offset that is a label defined later
- run_dump_test "atend"
-# test for data transfer instructions
- run_dump_test "ld-group"
-# test for block instructions
- run_dump_test "block"
-# test for arithmetic and logic
- run_dump_test "arith"
-# test for rotate and shift
- run_dump_test "rotate"
-# test for bit manipulations
- run_dump_test "bit"
-# test for branch instructions
- run_dump_test "branch"
-# test for input and output instructions
- run_dump_test "inout"
-# test for strings
- run_dump_test "strings"
-# test for dollar labels
- run_dump_test "dollar"
-# test for relocations
- run_dump_test "z80_reloc"
-# test for absolutely all documented instructions of Z80
- run_dump_test "z80_doc"
-# test for undocumented instructions like RLC (IX+3),A
- run_dump_test "z80_op_ii_ld"
-# test for undocumented instructions SLI/SLL
- run_dump_test "z80_sli"
-# test for undocumented instruction IN F,(C)
- run_dump_test "z80_in_f_c"
-# test for undocumented instruction OUT (C),0
- run_dump_test "z80_out_c_0"
-# test for instructions with index register halves
- run_dump_test "z80_ii8"
-#test for other instructions
- run_dump_test "misc"
gas_test_error "ill_op.s" "" "Illegal operand: ld hl,(sp+0)"
-# test for all Z80 documented instructions for R800
- run_dump_test "r800_z80_doc"
-# test for R800 instructions with index register halves
- run_dump_test "r800_ii8"
-# test for R800 extra instructions
- run_dump_test "r800_extra"
-#test for Z180 instructions
- run_dump_test "z180"
-#test for Z80 instructions while compiling for Z180
- run_dump_test "z180_z80_doc"
-#test for eZ80 instructions in Z80 mode
- run_dump_test "ez80_z80_all"
-#test for eZ80 instructions with sufficies in Z80 mode
- run_dump_test "ez80_z80_suf"
-#test for eZ80 instructions in ADL mode
- run_dump_test "ez80_adl_all"
-#test for eZ80 instructions with sufficies in ADL mode
- run_dump_test "ez80_adl_suf"
-#test for eZ80 opcode prefixes as multiple bytes before instruction
- run_dump_test "ez80_pref_dis"
-#test for GBZ80 instruction set
- run_dump_test "gbz80_all"
-#test for Z80N instruction set
- run_dump_test "z80n_all"
-#test for Z80N push nn relocation test
- run_dump_test "z80n_reloc"
-# test for SDCC compatibility mode
- run_dump_test "sdcc"
-# test for colonless labels
- run_dump_test "colonless"
-# test for FP math48
- run_dump_test "fp_math48"
-# test for FP zeda32
- run_dump_test "fp_zeda32"
}
diff --git a/gas/testsuite/gas/z80/z80_strict_unsup_regs.d b/gas/testsuite/gas/z80/z80_strict_unsup_regs.d
new file mode 100644
index 00000000000..9fad3d027b0
--- /dev/null
+++ b/gas/testsuite/gas/z80/z80_strict_unsup_regs.d
@@ -0,0 +1,39 @@
+#name: Z80 use unsupported registers as labels in strict mode
+#as: -march=z80-full --defsym NO_REG_F= --defsym NO_XYHL=
+#objdump: -d
+#source: unsup_regs.s
+
+.*: .*
+
+Disassembly of section \.text:
+
+0+00 <_start>:
+[ ]+0:[ ]+3e 02[ ]+ld a,0x02
+
+0+02 <ixl>:
+[ ]+2:[ ]+06 04[ ]+ld b,0x04
+
+0+04 <ixh>:
+[ ]+4:[ ]+0e 06[ ]+ld c,0x06
+
+0+06 <iyl>:
+[ ]+6:[ ]+16 08[ ]+ld d,0x08
+
+0+08 <f>:
+[ ]+8:[ ]+3e 08[ ]+ld a,0x08
+[ ]+a:[ ]+dd 29[ ]+add ix,ix
+[ ]+c:[ ]+dd 86 01[ ]+add a,\(ix\+1\)
+[ ]+f:[ ]+dd 21 34 12 ld ix,0x1234
+[ ]+13:[ ]+fd 21 21 43 ld iy,0x4321
+[ ]+17:[ ]+fd 22 34 12 ld \(0x1234\),iy
+[ ]+1b:[ ]+fd 77 ff[ ]+ld \(iy\-1\),a
+[ ]+1e:[ ]+ed 5f[ ]+ld a,r
+[ ]+20:[ ]+ed 4f[ ]+ld r,a
+[ ]+22:[ ]+ed 57[ ]+ld a,i
+[ ]+24:[ ]+ed 47[ ]+ld i,a
+
+0+26 <mb>:
+[ ]+26:[ ]+21 26 00[ ]+ld hl,0x0026
+[ ]+29:[ ]+3e 26[ ]+ld a,0x26
+[ ]+2b:[ ]+32 26 00[ ]+ld \(0x0026\),a
+#pass
diff --git a/gas/testsuite/gas/z80/z80_unsup_regs.d b/gas/testsuite/gas/z80/z80_unsup_regs.d
new file mode 100644
index 00000000000..fe5cc613af5
--- /dev/null
+++ b/gas/testsuite/gas/z80/z80_unsup_regs.d
@@ -0,0 +1,34 @@
+#name: Z80 use unsupported registers as labels when no -march specified
+#objdump: -d
+#source: unsup_regs.s
+
+.*: .*
+
+Disassembly of section \.text:
+
+0+00 <_start>:
+[ ]+0:[ ]+dd 7d[ ]+ld a,ixl
+[ ]+2:[ ]+dd 67[ ]+ld ixh,a
+[ ]+4:[ ]+dd 44[ ]+ld b,ixh
+[ ]+6:[ ]+dd 68[ ]+ld ixl,b
+[ ]+8:[ ]+fd 4d[ ]+ld c,iyl
+[ ]+a:[ ]+fd 61[ ]+ld iyh,c
+[ ]+c:[ ]+fd 54[ ]+ld d,iyh
+[ ]+e:[ ]+fd 6a[ ]+ld iyl,d
+[ ]+10:[ ]+ed 70[ ]+in f,\(c\)
+[ ]+12:[ ]+dd 29[ ]+add ix,ix
+[ ]+14:[ ]+dd 86 01[ ]+add a,\(ix\+1\)
+[ ]+17:[ ]+dd 21 34 12 ld ix,0x1234
+[ ]+1b:[ ]+fd 21 21 43 ld iy,0x4321
+[ ]+1f:[ ]+fd 22 34 12 ld \(0x1234\),iy
+[ ]+23:[ ]+fd 77 ff[ ]+ld \(iy\-1\),a
+[ ]+26:[ ]+ed 5f[ ]+ld a,r
+[ ]+28:[ ]+ed 4f[ ]+ld r,a
+[ ]+2a:[ ]+ed 57[ ]+ld a,i
+[ ]+2c:[ ]+ed 47[ ]+ld i,a
+
+0+2e <mb>:
+[ ]+2e:[ ]+21 2e 00[ ]+ld hl,0x002e
+[ ]+31:[ ]+3e 2e[ ]+ld a,0x2e
+[ ]+33:[ ]+32 2e 00[ ]+ld \(0x002e\),a
+#pass
diff --git a/gas/testsuite/gas/z80/z80n_unsup_regs.d b/gas/testsuite/gas/z80/z80n_unsup_regs.d
new file mode 100644
index 00000000000..c6888c9593d
--- /dev/null
+++ b/gas/testsuite/gas/z80/z80n_unsup_regs.d
@@ -0,0 +1,34 @@
+#name: Z80N use unsupported registers as labels
+#as: -march=z80n
+#objdump: -d
+#source: unsup_regs.s
+
+.*: .*
+
+Disassembly of section \.text:
+
+0+00 <_start>:
+[ ]+0:[ ]+dd 7d[ ]+ld a,ixl
+[ ]+2:[ ]+dd 67[ ]+ld ixh,a
+[ ]+4:[ ]+dd 44[ ]+ld b,ixh
+[ ]+6:[ ]+dd 68[ ]+ld ixl,b
+[ ]+8:[ ]+fd 4d[ ]+ld c,iyl
+[ ]+a:[ ]+fd 61[ ]+ld iyh,c
+[ ]+c:[ ]+fd 54[ ]+ld d,iyh
+[ ]+e:[ ]+fd 6a[ ]+ld iyl,d
+[ ]+10:[ ]+ed 70[ ]+in f,\(c\)
+[ ]+12:[ ]+dd 29[ ]+add ix,ix
+[ ]+14:[ ]+dd 86 01[ ]+add a,\(ix\+1\)
+[ ]+17:[ ]+dd 21 34 12 ld ix,0x1234
+[ ]+1b:[ ]+fd 21 21 43 ld iy,0x4321
+[ ]+1f:[ ]+fd 22 34 12 ld \(0x1234\),iy
+[ ]+23:[ ]+fd 77 ff[ ]+ld \(iy\-1\),a
+[ ]+26:[ ]+ed 5f[ ]+ld a,r
+[ ]+28:[ ]+ed 4f[ ]+ld r,a
+[ ]+2a:[ ]+ed 57[ ]+ld a,i
+[ ]+2c:[ ]+ed 47[ ]+ld i,a
+
+0+2e <mb>:
+[ ]+2e:[ ]+21 2e 00[ ]+ld hl,0x002e
+[ ]+31:[ ]+3e 2e[ ]+ld a,0x2e
+[ ]+33:[ ]+32 2e 00[ ]+ld \(0x002e\),a
diff --git a/opcodes/z80-dis.c b/opcodes/z80-dis.c
index d66bd75657b..b23e8e99fd8 100644
--- a/opcodes/z80-dis.c
+++ b/opcodes/z80-dis.c
@@ -400,24 +400,6 @@ cism (struct buffer *buf, disassemble_info * info, const char *txt ATTRIBUTE_UNU
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)
{
@@ -504,21 +486,28 @@ struct tab_elt opc_ed[] =
{ 0x7D, 0xFF, prt, "stmix", INSS_EZ80 },
{ 0x7E, 0xFF, prt, "rsmix", INSS_EZ80 },
{ 0x82, 0xE6, cism, "", INSS_Z180|INSS_EZ80 },
- { 0x84, 0xC7, cis2, "", INSS_EZ80 },
+ { 0x84, 0xFF, prt, "ini2", INSS_EZ80 },
{ 0x8A, 0xFF, prt_n_n, "push 0x%02x%%02x", INSS_Z80N },
+ { 0x8C, 0xFF, prt, "ind2", INSS_EZ80 },
{ 0x90, 0xFF, prt, "outinb", INSS_Z80N },
{ 0x91, 0xFF, prt_n_n, "nextreg 0x%02x,0x%%02x", INSS_Z80N },
{ 0x92, 0xFF, prt_n, "nextreg 0x%02x,a", INSS_Z80N },
{ 0x93, 0xFF, prt, "pixeldn", INSS_Z80N },
+ { 0x94, 0xFF, prt, "ini2r", INSS_EZ80 },
{ 0x94, 0xFF, prt, "pixelad", INSS_Z80N },
{ 0x95, 0xFF, prt, "setae", INSS_Z80N },
{ 0x98, 0xFF, prt, "jp (c)", INSS_Z80N },
+ { 0x9c, 0xFF, prt, "ind2r", INSS_EZ80 },
{ 0xA0, 0xE4, cis, "", INSS_ALL },
+ { 0xA4, 0xFF, prt, "outi2", INSS_EZ80 },
{ 0xA4, 0xFF, prt, "ldix", INSS_Z80N },
+ { 0xAC, 0xFF, prt, "outd2", INSS_EZ80 },
{ 0xAC, 0xFF, prt, "lddx", INSS_Z80N },
{ 0xA5, 0xFF, prt, "ldws", INSS_Z80N },
+ { 0xB4, 0xFF, prt, "oti2r", INSS_EZ80 },
{ 0xB4, 0xFF, prt, "ldirx", INSS_Z80N },
{ 0xB7, 0xFF, prt, "ldpirx", INSS_Z80N },
+ { 0xBC, 0xFF, prt, "otd2r", INSS_EZ80 },
{ 0xBC, 0xFF, prt, "lddrx", INSS_Z80N },
{ 0xC2, 0xFF, prt, "inirx", INSS_EZ80 },
{ 0xC3, 0xFF, prt, "otirx", INSS_EZ80 },
More information about the Binutils-cvs
mailing list