RISC-V: Eliminate long-casts of X_add_number in diagnostics

Message ID 20220930103919.323690-1-christoph.muellner@vrull.eu
State Accepted, archived
Headers
Series RISC-V: Eliminate long-casts of X_add_number in diagnostics |

Checks

Context Check Description
snail/binutils-gdb-check success Github commit url

Commit Message

Christoph Müllner Sept. 30, 2022, 10:39 a.m. UTC
  From: Christoph Müllner <christoph.muellner@vrull.eu>

As reported in (and in addition to)
https://sourceware.org/pipermail/binutils/2022-September/123198.html
there is no need for casts to (signed/unsigned) long, as we can use
C99's PRIs64/PRIu64 format specifiers.

Signed-off-by: Christoph Müllner <christoph.muellner@vrull.eu>
---
 gas/config/tc-riscv.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
  

Comments

Jan Beulich Sept. 30, 2022, 10:46 a.m. UTC | #1
On 30.09.2022 12:39, Christoph Muellner wrote:
> From: Christoph Müllner <christoph.muellner@vrull.eu>
> 
> As reported in (and in addition to)
> https://sourceware.org/pipermail/binutils/2022-September/123198.html
> there is no need for casts to (signed/unsigned) long, as we can use
> C99's PRIs64/PRIu64 format specifiers.

For archaeologists you may want to s/PRIs64/PRId64/, such that no-one
will be misguided. Otherwise thanks for taking care of the other items
this quickly. I'll leave approving of this (as well as my earlier
patch) to the arch maintainers, though.

Jan
  
Nelson Chu Sept. 30, 2022, 2:45 p.m. UTC | #2
Both approved, please commit.  Thanks for helping to fix them.

Nelson

On Fri, Sep 30, 2022 at 6:46 PM Jan Beulich <jbeulich@suse.com> wrote:
>
> On 30.09.2022 12:39, Christoph Muellner wrote:
> > From: Christoph Müllner <christoph.muellner@vrull.eu>
> >
> > As reported in (and in addition to)
> > https://sourceware.org/pipermail/binutils/2022-September/123198.html
> > there is no need for casts to (signed/unsigned) long, as we can use
> > C99's PRIs64/PRIu64 format specifiers.
>
> For archaeologists you may want to s/PRIs64/PRId64/, such that no-one
> will be misguided. Otherwise thanks for taking care of the other items
> this quickly. I'll leave approving of this (as well as my earlier
> patch) to the arch maintainers, though.
>
> Jan
  
Philipp Tomsich Sept. 30, 2022, 2:55 p.m. UTC | #3
Thanks! Applied to master.

Philipp.


On Fri, 30 Sept 2022 at 16:46, Nelson Chu <nelson@rivosinc.com> wrote:
>
> Both approved, please commit.  Thanks for helping to fix them.
>
> Nelson
>
> On Fri, Sep 30, 2022 at 6:46 PM Jan Beulich <jbeulich@suse.com> wrote:
> >
> > On 30.09.2022 12:39, Christoph Muellner wrote:
> > > From: Christoph Müllner <christoph.muellner@vrull.eu>
> > >
> > > As reported in (and in addition to)
> > > https://sourceware.org/pipermail/binutils/2022-September/123198.html
> > > there is no need for casts to (signed/unsigned) long, as we can use
> > > C99's PRIs64/PRIu64 format specifiers.
> >
> > For archaeologists you may want to s/PRIs64/PRId64/, such that no-one
> > will be misguided. Otherwise thanks for taking care of the other items
> > this quickly. I'll leave approving of this (as well as my earlier
> > patch) to the arch maintainers, though.
> >
> > Jan
  
Jeff Law Sept. 30, 2022, 7:26 p.m. UTC | #4
On 9/30/22 04:39, Christoph Muellner wrote:
> From: Christoph Müllner <christoph.muellner@vrull.eu>
>
> As reported in (and in addition to)
> https://sourceware.org/pipermail/binutils/2022-September/123198.html
> there is no need for casts to (signed/unsigned) long, as we can use
> C99's PRIs64/PRIu64 format specifiers.
>
> Signed-off-by: Christoph Müllner <christoph.muellner@vrull.eu>

OK.


jeff
  

Patch

diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c
index b107420756b..035d8c55628 100644
--- a/gas/config/tc-riscv.c
+++ b/gas/config/tc-riscv.c
@@ -2921,8 +2921,8 @@  riscv_ip (char *str, struct riscv_cl_insn *ip, expressionS *imm_expr,
 	      my_getExpression (imm_expr, asarg);
 	      check_absolute_expr (ip, imm_expr, false);
 	      if ((unsigned long) imm_expr->X_add_number > 31)
-		as_bad (_("improper shift amount (%lu)"),
-			(unsigned long) imm_expr->X_add_number);
+		as_bad (_("improper shift amount (%"PRIu64")"),
+			imm_expr->X_add_number);
 	      INSERT_OPERAND (SHAMTW, *ip, imm_expr->X_add_number);
 	      imm_expr->X_op = O_absent;
 	      asarg = expr_end;
@@ -2932,8 +2932,8 @@  riscv_ip (char *str, struct riscv_cl_insn *ip, expressionS *imm_expr,
 	      my_getExpression (imm_expr, asarg);
 	      check_absolute_expr (ip, imm_expr, false);
 	      if ((unsigned long) imm_expr->X_add_number >= xlen)
-		as_bad (_("improper shift amount (%lu)"),
-			(unsigned long) imm_expr->X_add_number);
+		as_bad (_("improper shift amount (%"PRIu64")"),
+			imm_expr->X_add_number);
 	      INSERT_OPERAND (SHAMT, *ip, imm_expr->X_add_number);
 	      imm_expr->X_op = O_absent;
 	      asarg = expr_end;
@@ -2943,8 +2943,8 @@  riscv_ip (char *str, struct riscv_cl_insn *ip, expressionS *imm_expr,
 	      my_getExpression (imm_expr, asarg);
 	      check_absolute_expr (ip, imm_expr, false);
 	      if ((unsigned long) imm_expr->X_add_number > 31)
-		as_bad (_("improper CSRxI immediate (%lu)"),
-			(unsigned long) imm_expr->X_add_number);
+		as_bad (_("improper CSRxI immediate (%"PRIu64")"),
+			imm_expr->X_add_number);
 	      INSERT_OPERAND (RS1, *ip, imm_expr->X_add_number);
 	      imm_expr->X_op = O_absent;
 	      asarg = expr_end;
@@ -2960,8 +2960,8 @@  riscv_ip (char *str, struct riscv_cl_insn *ip, expressionS *imm_expr,
 		  my_getExpression (imm_expr, asarg);
 		  check_absolute_expr (ip, imm_expr, true);
 		  if ((unsigned long) imm_expr->X_add_number > 0xfff)
-		    as_bad (_("improper CSR address (%lu)"),
-			    (unsigned long) imm_expr->X_add_number);
+		    as_bad (_("improper CSR address (%"PRIu64")"),
+			    imm_expr->X_add_number);
 		  INSERT_OPERAND (CSR, *ip, imm_expr->X_add_number);
 		  imm_expr->X_op = O_absent;
 		  asarg = expr_end;