Re: [PATCH v2] IBM zSystems: Accept (. - 0x100000000) PCRel32 operands

[Ilya Leoshkevich <iii@linux.ibm.com>]

On Thu, 2022-05-12 at 12:25 +0930, Alan Modra wrote:
> The new test failed on s390-linux due to bfd_sprintf_vma trimming
> output to 32 bits for 32-bit targets.  The test was faulty anyway,
> expecting zero as the min end of the range is plainly wrong, but
> that's what you get if you cast min to int.
> 
> I'm applying the following to fix this.  You could also use
> as_bad_value_out_of_range here, and you'll get hex values for the
> test.  The code would become
> 
>       if (val < min || val > max)
>         {
>           if (operand->flags & S390_OPERAND_PCREL)
>             {
>               val <<= 1;
>               min <<= 1;
>               max <<= 1;
>             }
>           as_bad_value_out_of_range (_("operand"), val, min, max,
> file, line);
>           return;
>         }
> 
> 
>         * config/tc-s390.c (s390_insert_operand): Print range error
> using
>         PRId64.
>         * testsuite/gas/s390/zarch-z900-err.l: Correct expected
> output.
> 
> diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
> index 4fd4f1f0693..fb452f8a986 100644
> --- a/gas/config/tc-s390.c
> +++ b/gas/config/tc-s390.c
> @@ -617,8 +617,8 @@ s390_insert_operand (unsigned char *insn,
>        if (val < min || val > max)
>         {
>           const char *err =
> -           _("operand out of range (%s not between %ld and %ld)");
> -         char buf[100];
> +           _("operand out of range (%" PRId64 " not between %"
> PRId64
> +             " and %" PRId64 ")");
>  
>           if (operand->flags & S390_OPERAND_PCREL)
>             {
> @@ -626,11 +626,11 @@ s390_insert_operand (unsigned char *insn,
>               min <<= 1;
>               max <<= 1;
>             }
> -         bfd_sprintf_vma (stdoutput, buf, val);
>           if (file == (char *) NULL)
> -           as_bad (err, buf, (int) min, (int) max);
> +           as_bad (err, (int64_t) val, (int64_t) min, (int64_t)
> max);
>           else
> -           as_bad_where (file, line, err, buf, (int) min, (int)
> max);
> +           as_bad_where (file, line,
> +                         err, (int64_t) val, (int64_t) min,
> (int64_t) max);
>           return;
>         }
>        /* val is ok, now restrict it to operand->bits bits.  */
> diff --git a/gas/testsuite/gas/s390/zarch-z900-err.l
> b/gas/testsuite/gas/s390/zarch-z900-err.l
> index 72994192095..cf8e9c2cefc 100644
> --- a/gas/testsuite/gas/s390/zarch-z900-err.l
> +++ b/gas/testsuite/gas/s390/zarch-z900-err.l
> @@ -1,3 +1,3 @@
>  .*: Assembler messages:
> -.*:3: Error: operand out of range \(fffffffefffffffe not between 0
> and 4294967294\)
> -.*:4: Error: operand out of range \(0000000100000000 not between 0
> and 4294967294\)
> +.*:3: Error: operand out of range \(-4294967298 not between -
> 4294967296 and 4294967294\)
> +.*:4: Error: operand out of range \(4294967296 not between -
> 4294967296 and 4294967294\)
> 

Sorry for the breakage and thanks for fixing it.
Not sure how I missed it - I just tried rebuilding my local commit, and
it's visible there as well.