2.41 Release sources

[thirdparty/binutils-gdb.git] / gas / config / tc-z80.c

diff --git a/gas/config/tc-z80.c b/gas/config/tc-z80.c
index e9c664db63e5d49c89c3017cef3a70955e3e633d..577c58479dad7b60a39e447ed0aeae062c51035b 100644 (file)
--- a/gas/config/tc-z80.c
+++ b/gas/config/tc-z80.c
@@ -1,5 +1,5 @@
 /* tc-z80.c -- Assemble code for the Zilog Z80, Z180, EZ80 and ASCII R800
-   Copyright (C) 2005-2021 Free Software Foundation, Inc.
+   Copyright (C) 2005-2023 Free Software Foundation, Inc.
    Contributed by Arnold Metselaar <arnold_m@operamail.com>
 
    This file is part of GAS, the GNU Assembler.
@@ -175,6 +175,11 @@ match_ext_table [] =
   {"xdcb",    INS_ROT_II_LD, 0, 0, "instructions like RL (IX+d),R (DD/FD CB dd oo)" }
 };
 
+
+static int signed_overflow (signed long value, unsigned bitsize);
+static int unsigned_overflow (unsigned long value, unsigned bitsize);
+static int is_overflow (long value, unsigned bitsize);
+
 static void
 setup_march (const char *name, int *ok, int *err, int *mode)
 {
@@ -533,7 +538,7 @@ md_begin (void)
 }
 
 void
-z80_md_end (void)
+z80_md_finish (void)
 {
   int mach_type;
 
@@ -921,6 +926,7 @@ parse_exp_not_indexed (const char *s, expressionS *op)
     }
   input_line_pointer = (char*) s ;
   expression (op);
+  resolve_register (op);
   switch (op->X_op)
     {
     case O_absent:
@@ -1129,6 +1135,16 @@ emit_data_val (expressionS * val, int size)
   if (val->X_op == O_constant)
     {
       int i;
+
+       /* PR 28791:
+         Check for overflow, but ignore values that were generated by bit
+         manipulation operators (eg ~0xe6 and -7).  This does mean that
+         manipluated overlarge values will not be reported (eg ~0x1234),
+         but it does help to maintain compatibility with earlier versions
+         of the assembler.  */
+      if (! val->X_extrabit
+         && is_overflow (val->X_add_number, size*8))
+       as_warn ( _("%d-bit overflow (%+ld)"), size*8, val->X_add_number);
       for (i = 0; i < size; ++i)
        p[i] = (char)(val->X_add_number >> (i*8));
       return;
@@ -1177,6 +1193,23 @@ emit_data_val (expressionS * val, int size)
            {
            case 0: r_type = BFD_RELOC_Z80_WORD0; break;
            case 16: r_type = BFD_RELOC_Z80_WORD1; break;
+           case 8:
+           case 24: /* add two byte fixups */
+             val->X_op = O_symbol;
+             val->X_op_symbol = NULL;
+             val->X_add_number = 0;
+             if (shift == 8)
+               {
+                 fix_new_exp (frag_now, p++ - frag_now->fr_literal, 1, val, false,
+                              BFD_RELOC_Z80_BYTE1);
+                 /* prepare to next byte */
+                 r_type = BFD_RELOC_Z80_BYTE2;
+               }
+             else
+               r_type = BFD_RELOC_Z80_BYTE3; /* high byte will be 0 */
+             size = 1;
+             simplify = false;
+             break;
            default: simplify = false;
            }
        }
@@ -2374,6 +2407,8 @@ emit_ld_r_m (expressionS *dst, expressionS *src)
          *q = (ins_ok & INS_GBZ80) ? 0xFA : 0x3A;
           emit_word (src);
         }
+      else
+       ill_op ();
     }
 }
 
@@ -3674,16 +3709,25 @@ md_assemble (char *str)
   input_line_pointer = old_ptr;
 }
 
+static int
+signed_overflow (signed long value, unsigned bitsize)
+{
+  signed long max = (signed long) ((1UL << (bitsize - 1)) - 1);
+  return value < -max - 1 || value > max;
+}
+
+static int
+unsigned_overflow (unsigned long value, unsigned bitsize)
+{
+  return value >> (bitsize - 1) >> 1 != 0;
+}
+
 static int
 is_overflow (long value, unsigned bitsize)
 {
-  long fieldmask = (2UL << (bitsize - 1)) - 1;
-  long signmask = ~fieldmask;
-  long a = value & fieldmask;
-  long ss = a & signmask;
-  if (ss != 0 && ss != (signmask & fieldmask))
-    return 1;
-  return 0;
+  if (value < 0)
+    return signed_overflow (value, bitsize);
+  return unsigned_overflow ((unsigned long)value, bitsize);
 }
 
 void
@@ -3724,7 +3768,7 @@ md_apply_fix (fixS * fixP, valueT* valP, segT seg)
     {
     case BFD_RELOC_8_PCREL:
     case BFD_RELOC_Z80_DISP8:
-      if (fixP->fx_done && (val < -0x80 || val > 0x7f))
+      if (fixP->fx_done && signed_overflow (val, 8))
        as_bad_where (fixP->fx_file, fixP->fx_line,
                      _("8-bit signed offset out of range (%+ld)"), val);
       *p_lit++ = val;
@@ -3818,7 +3862,7 @@ tc_gen_reloc (asection *seg ATTRIBUTE_UNUSED , fixS *fixp)
 
   if (fixp->fx_subsy != NULL)
     {
-      as_bad_where (fixp->fx_file, fixp->fx_line, _("expression too complex"));
+      as_bad_subtract (fixp);
       return NULL;
     }
 
@@ -3867,11 +3911,11 @@ z80_tc_label_is_local (const char *name)
 #define EXP_MIN -0x10000
 #define EXP_MAX 0x10000
 static int
-str_to_broken_float (bool *signP, bfd_uint64_t *mantissaP, int *expP)
+str_to_broken_float (bool *signP, uint64_t *mantissaP, int *expP)
 {
   char *p;
   bool sign;
-  bfd_uint64_t mantissa = 0;
+  uint64_t mantissa = 0;
   int exponent = 0;
   int i;
 
@@ -3986,7 +4030,7 @@ str_to_broken_float (bool *signP, bfd_uint64_t *mantissaP, int *expP)
 static const char *
 str_to_zeda32(char *litP, int *sizeP)
 {
-  bfd_uint64_t mantissa;
+  uint64_t mantissa;
   bool sign;
   int exponent;
   unsigned i;
@@ -4045,7 +4089,7 @@ str_to_zeda32(char *litP, int *sizeP)
 static const char *
 str_to_float48(char *litP, int *sizeP)
 {
-  bfd_uint64_t mantissa;
+  uint64_t mantissa;
   bool sign;
   int exponent;
   unsigned i;