[binutils-gdb] opcodes: tic4x_disassemble swap xcalloc arguments

Mark Wielaard mark@sourceware.org
Mon Jan 22 17:21:07 GMT 2024


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5bc519bf0c8d34df4fe5e37511a7ddee518684d1

commit 5bc519bf0c8d34df4fe5e37511a7ddee518684d1
Author: Mark Wielaard <mark@klomp.org>
Date:   Sun Jan 21 21:51:26 2024 +0100

    opcodes: tic4x_disassemble swap xcalloc arguments
    
    GCC 14 will detect when the size and count arguments of calloc are
    swapped.
    
    binutils-gdb/opcodes/tic4x-dis.c: In function ‘tic4x_disassemble’:
    binutils-gdb/opcodes/tic4x-dis.c:710:32: error: ‘xcalloc’ sizes specified with ‘sizeof’ in the earlier argument and not in the later argument [-Werror=calloc-transposed-args]
      710 |       optab = xcalloc (sizeof (tic4x_inst_t *), (1 << TIC4X_HASH_SIZE));
          |                                ^~~~~~~~~~~~
    binutils-gdb/opcodes/tic4x-dis.c:710:32: note: earlier argument should specify number of elements, later size of each element
    binutils-gdb/opcodes/tic4x-dis.c:712:40: error: ‘xcalloc’ sizes specified with ‘sizeof’ in the earlier argument and not in the later argument [-Werror=calloc-transposed-args]
      712 |       optab_special = xcalloc (sizeof (tic4x_inst_t *), TIC4X_SPESOP_SIZE);
          |                                        ^~~~~~~~~~~~
    binutils-gdb/opcodes/tic4x-dis.c:712:40: note: earlier argument should specify number of elements, later size of each element
    
    opcodes/ChangeLog:
    
            * /tic4x-dis.c (tic4x_disassemble): Swap size and count xcalloc
            arguments.

Diff:
---
 opcodes/tic4x-dis.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/opcodes/tic4x-dis.c b/opcodes/tic4x-dis.c
index 49de510981b..0c703ecf08a 100644
--- a/opcodes/tic4x-dis.c
+++ b/opcodes/tic4x-dis.c
@@ -707,9 +707,9 @@ tic4x_disassemble (unsigned long pc,
 
   if (optab == NULL)
     {
-      optab = xcalloc (sizeof (tic4x_inst_t *), (1 << TIC4X_HASH_SIZE));
+      optab = xcalloc ((1 << TIC4X_HASH_SIZE), sizeof (tic4x_inst_t *));
 
-      optab_special = xcalloc (sizeof (tic4x_inst_t *), TIC4X_SPESOP_SIZE);
+      optab_special = xcalloc (TIC4X_SPESOP_SIZE, sizeof (tic4x_inst_t *));
 
       /* Install opcodes in reverse order so that preferred
 	 forms overwrite synonyms.  */


More information about the Binutils-cvs mailing list