A small set of code improvements for the Z80 assembler.

	PR 26692
	* config/tc-z80.c (md_begin): Ensure that xpressions are empty
	before using them.
	(unify_indexed): Likewise.
	(z80_start_line_hook): Improve hash sign handling when SDCC
	compatibility mode enabled.
	(md_parse_exp_not_indexed): Improve indirect addressing
	detection.
	(md_pseudo_table): Accept hd64 as an alias of z810.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 2b04cef66b70b98002cf746ffa9e22c475733082..30019327d65b399ad24cfad595ba6c604f88cd22 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,15 @@
+2020-10-06  Sergey Belyashav  <sergey.belyashov@gmail.com>
+
+       PR 26692
+       * config/tc-z80.c (md_begin): Ensure that xpressions are empty
+       before using them.
+       (unify_indexed): Likewise.
+       (z80_start_line_hook): Improve hash sign handling when SDCC
+       compatibility mode enabled.
+       (md_parse_exp_not_indexed): Improve indirect addressing
+       detection.
+       (md_pseudo_table): Accept hd64 as an alias of z810.
+
 2020-10-06  Alan Modra  <amodra@gmail.com>
 
        * testsuite/gas/elf/sh-link-zero.s: Don't start directives in

diff --git a/gas/config/tc-z80.c b/gas/config/tc-z80.c
index 2e17d00552271a6f16189fe9adf697f53b7e384f..e5dc877674264f59fec72dac2c9a1f3ce82defde 100644 (file)
--- a/gas/config/tc-z80.c
+++ b/gas/config/tc-z80.c
@@ -492,6 +492,9 @@ md_begin (void)
   unsigned int i, j, k;
   char buf[BUFLEN];
 
+  memset (&reg, 0, sizeof (reg));
+  memset (&nul, 0, sizeof (nul));
+
   if (ins_ok & INS_EZ80)   /* if select EZ80 cpu then */
     listing_lhs_width = 6; /* use 6 bytes per line in the listing */
 
@@ -612,9 +615,16 @@ z80_start_line_hook (void)
              return 1;
            }
          break;
-       case '#':
-         if (sdcc_compat)
-           *p = (*skip_space (p + 1) == '(') ? '+' : ' ';
+       case '#': /* force to use next expression as immediate value in SDCC */
+         if (!sdcc_compat)
+          break;
+         if (ISSPACE(p[1]) && *skip_space (p + 1) == '(')
+           { /* ld a,# (expr)... -> ld a,0+(expr)... */
+             *p++ = '0';
+             *p = '+';
+           }
+         else /* ld a,#(expr)... -> ld a,+(expr); ld a,#expr -> ld a, expr */
+           *p = (p[1] == '(') ? '+' : ' ';
          break;
        }
     }
@@ -871,6 +881,7 @@ parse_exp_not_indexed (const char *s, expressionS *op)
   int indir;
   int make_shift = -1;
 
+  memset (op, 0, sizeof (*op));
   p = skip_space (s);
   if (sdcc_compat && (*p == '<' || *p == '>'))
     {
@@ -887,7 +898,11 @@ parse_exp_not_indexed (const char *s, expressionS *op)
       p = skip_space (p);
     }
 
-  op->X_md = indir = is_indir (p);
+  if (make_shift == -1)
+    indir = is_indir (p);
+  else
+    indir = 0;
+  op->X_md = indir;
   if (indir && (ins_ok & INS_GBZ80))
     { /* check for instructions like ld a,(hl+), ld (hl-),a */
       p = skip_space (p+1);
@@ -950,10 +965,9 @@ unify_indexed (expressionS *op)
   if (O_subtract == op->X_op)
     {
       expressionS minus;
+      memset (&minus, 0, sizeof (minus));
       minus.X_op = O_uminus;
-      minus.X_add_number = 0;
       minus.X_add_symbol = op->X_op_symbol;
-      minus.X_op_symbol = 0;
       op->X_op_symbol = make_expr_symbol (&minus);
       op->X_op = O_add;
     }
@@ -966,7 +980,6 @@ unify_indexed (expressionS *op)
       add.X_op = O_symbol;
       add.X_add_number = op->X_add_number;
       add.X_add_symbol = op->X_op_symbol;
-      add.X_op_symbol = 0;
       op->X_add_symbol = make_expr_symbol (&add);
     }
   else
@@ -3444,6 +3457,7 @@ const pseudo_typeS md_pseudo_table[] =
   { ".r800", set_inss, INS_R800},
   { ".set", s_set, 0},
   { ".z180", set_inss, INS_Z180},
+  { ".hd64", set_inss, INS_Z180},
   { ".z80", set_inss, INS_Z80},
   { ".z80n", set_inss, INS_Z80N},
   { "db" , emit_data, 1},