Skip to contentSkip to conversation

powerpc/xmon: replace sizeof calculations with ARRAY_SIZE macro

PATCH Applied Ruben Wauters 4 participants 7 messages Jul 19, 2025 – Sep 6, 2025 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 1/1 powerpc/xmon: replace sizeof calculations with ARRAY_SIZE macro

The calculations for operand/opcode/macro numbers are done in an identical manner to the already existing ARRAY_SIZE macro in linux/array_size.h

This patch replaces the sizeof calculations with the macro to make the code cleaner and more immediately obvious what it is doing.

---
 arch/powerpc/xmon/ppc-opc.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)
arch/powerpc/xmon/ppc-opc.c +6 -10
index 0774d711453e..de9b4236728c 100644
@@ -954,8 +954,7 @@ const struct powerpc_operand powerpc_operands[] =
   { 0xff, 11, NULL, NULL, PPC_OPERAND_SIGNOPT },
 };
 
-const unsigned int num_powerpc_operands = (sizeof (powerpc_operands)
-					   / sizeof (powerpc_operands[0]));
+const unsigned int num_powerpc_operands = ARRAY_SIZE(powerpc_operands);
 
 /* The functions used to insert and extract complicated operands.  */
 
@@ -6968,9 +6967,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"fcfidu.",	XRC(63,974,1),	XRA_MASK, POWER7|PPCA2,	PPCVLE,		{FRT, FRB}},
 };
 
-const int powerpc_num_opcodes =
-  sizeof (powerpc_opcodes) / sizeof (powerpc_opcodes[0]);
-
+const int powerpc_num_opcodes = ARRAY_SIZE(powerpc_opcodes);
+
 /* The VLE opcode table.
 
    The format of this opcode table is the same as the main opcode table.  */
@@ -7207,9 +7205,8 @@ const struct powerpc_opcode vle_opcodes[] = {
 {"se_bl",	BD8(58,0,1),	BD8_MASK,	PPCVLE,	0,		{B8}},
 };
 
-const int vle_num_opcodes =
-  sizeof (vle_opcodes) / sizeof (vle_opcodes[0]);
-
+const int vle_num_opcodes = ARRAY_SIZE(vle_opcodes);
+
 /* The macro table.  This is only used by the assembler.  */
 
 /* The expressions of the form (-x ! 31) & (x | 31) have the value 0
@@ -7276,5 +7273,4 @@ const struct powerpc_macro powerpc_macros[] = {
 {"e_clrlslwi",4, PPCVLE, "e_rlwinm %0,%1,%3,(%2)-(%3),31-(%3)"},
 };
 
-const int powerpc_num_macros =
-  sizeof (powerpc_macros) / sizeof (powerpc_macros[0]);
+const int powerpc_num_macros = ARRAY_SIZE(powerpc_macros);
Signature · 1 line
2.49.1
#2 lore raw

Le 20/07/2025 à 00:43, Ruben Wauters a écrit :

Quoted 6 lines

[Vous ne recevez pas souvent de courriers de [email protected]. Découvrez pourquoi ceci est important à https://aka.ms/LearnAboutSenderIdentification ]

The calculations for operand/opcode/macro numbers are done in an identical manner to the already existing ARRAY_SIZE macro in linux/array_size.h

Quoted 6 lines

This patch replaces the sizeof calculations with the macro to make the code cleaner and more immediately obvious what it is doing.

---
  arch/powerpc/xmon/ppc-opc.c | 16 ++++++----------

This file is mostly taken from binutils, refer commit 08d96e0b127e ("powerpc/xmon: Apply binutils changes to upgrade disassembly").

I think your change should be done in binutils then backported to the kernel. The more we diverge from binutils the worse it is.

Christophe

Quoted 50 lines
  1 file changed, 6 insertions(+), 10 deletions(-)
arch/powerpc/xmon/ppc-opc.c +6 -11
index 0774d711453e..de9b4236728c 100644
@@ -954,8 +954,7 @@ const struct powerpc_operand powerpc_operands[] =
    { 0xff, 11, NULL, NULL, PPC_OPERAND_SIGNOPT },
  };
 
-const unsigned int num_powerpc_operands = (sizeof (powerpc_operands)
-                                          / sizeof (powerpc_operands[0]));
+const unsigned int num_powerpc_operands = ARRAY_SIZE(powerpc_operands);
 
  /* The functions used to insert and extract complicated operands.  */
 
@@ -6968,9 +6967,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
  {"fcfidu.",    XRC(63,974,1),  XRA_MASK, POWER7|PPCA2, PPCVLE,         {FRT, FRB}},
  };
 
-const int powerpc_num_opcodes =
-  sizeof (powerpc_opcodes) / sizeof (powerpc_opcodes[0]);
-
+const int powerpc_num_opcodes = ARRAY_SIZE(powerpc_opcodes);
+
  /* The VLE opcode table.
 
     The format of this opcode table is the same as the main opcode table.  */
@@ -7207,9 +7205,8 @@ const struct powerpc_opcode vle_opcodes[] = {
  {"se_bl",      BD8(58,0,1),    BD8_MASK,       PPCVLE, 0,              {B8}},
  };
 
-const int vle_num_opcodes =
-  sizeof (vle_opcodes) / sizeof (vle_opcodes[0]);
-
+const int vle_num_opcodes = ARRAY_SIZE(vle_opcodes);
+
  /* The macro table.  This is only used by the assembler.  */
 
  /* The expressions of the form (-x ! 31) & (x | 31) have the value 0
@@ -7276,5 +7273,4 @@ const struct powerpc_macro powerpc_macros[] = {
  {"e_clrlslwi",4, PPCVLE, "e_rlwinm %0,%1,%3,(%2)-(%3),31-(%3)"},
  };
 
-const int powerpc_num_macros =
-  sizeof (powerpc_macros) / sizeof (powerpc_macros[0]);
+const int powerpc_num_macros = ARRAY_SIZE(powerpc_macros);
--

2.49.1

#3 lore raw
Quoted 19 lines · Christophe Leroy

Le 20/07/2025 à 00:43, Ruben Wauters a écrit :

Quoted 8 lines

[Vous ne recevez pas souvent de courriers de [email protected]. Découvrez pourquoi ceci est important à
https://aka.ms/LearnAboutSenderIdentification ]

The calculations for operand/opcode/macro numbers are done in an identical manner to the already existing ARRAY_SIZE macro in linux/array_size.h

Quoted 7 lines

This patch replaces the sizeof calculations with the macro to make the
code cleaner and more immediately obvious what it is doing.

---
  arch/powerpc/xmon/ppc-opc.c | 16 ++++++----------

Quoted 5 lines

This file is mostly taken from binutils, refer commit 08d96e0b127e ("powerpc/xmon: Apply binutils changes to upgrade disassembly").

I think your change should be done in binutils then backported to the kernel. The more we diverge from binutils the worse it is

While this is somewhat reasonable, the header (linux/array_size.h) is linux specific, and is included through kernel.h

I can probably see if binutils has a similar header, or if they would accept an equivalent header to make the file equivalent, but I'm unsure if they would

Ruben

Quoted 65 lines

Christophe

Quoted 62 lines
  1 file changed, 6 insertions(+), 10 deletions(-)
arch/powerpc/xmon/ppc- renamed from arch/powerpc/xmon/ppc-opc.c +0 -0

opc.c
index 0774d711453e..de9b4236728c 100644

arch/powerpc/xmon/ppc-opc.c +0 -0
@@ -954,8 +954,7 @@ const struct powerpc_operand powerpc_operands[]

=
    { 0xff, 11, NULL, NULL, PPC_OPERAND_SIGNOPT }, };

-const unsigned int num_powerpc_operands = (sizeof (powerpc_operands)
-                                          / sizeof (powerpc_operands[0]));
+const unsigned int num_powerpc_operands = ARRAY_SIZE(powerpc_operands);

  /* The functions used to insert and extract complicated operands.  */

arch/powerpc/xmon/ppc-opc.c +2 -3
@@ -6968,9 +6967,8 @@ const struct powerpc_opcode powerpc_opcodes[]
 = {
   {"fcfidu.",    XRC(63,974,1),  XRA_MASK, POWER7|PPCA2,
 PPCVLE,         {FRT, FRB}},
   };
 
-const int powerpc_num_opcodes =
-  sizeof (powerpc_opcodes) / sizeof (powerpc_opcodes[0]);
-
+const int powerpc_num_opcodes = ARRAY_SIZE(powerpc_opcodes);
+
   /* The VLE opcode table.

     The format of this opcode table is the same as the main opcode table.  */

arch/powerpc/xmon/ppc-opc.c +2 -3
@@ -7207,9 +7205,8 @@ const struct powerpc_opcode vle_opcodes[] = {
   {"se_bl",      BD8(58,0,1),    BD8_MASK,       PPCVLE,
 0,              {B8}},
   };
 
-const int vle_num_opcodes =
-  sizeof (vle_opcodes) / sizeof (vle_opcodes[0]);
-
+const int vle_num_opcodes = ARRAY_SIZE(vle_opcodes);
+
   /* The macro table.  This is only used by the assembler.  */
 

  /* The expressions of the form (-x ! 31) & (x | 31) have the value 0

arch/powerpc/xmon/ppc-opc.c +1 -3
@@ -7276,5 +7273,4 @@ const struct powerpc_macro powerpc_macros[] =
 {
   {"e_clrlslwi",4, PPCVLE, "e_rlwinm %0,%1,%3,(%2)-(%3),31-(%3)"},
   };
 
-const int powerpc_num_macros =
-  sizeof (powerpc_macros) / sizeof (powerpc_macros[0]);
+const int powerpc_num_macros = ARRAY_SIZE(powerpc_macros);
--

2.49.1

#4 lore raw

Can't hurt to try at least.

If they don't merge it, then for code where we're not upstream, it's pretty common to just endure style issues. I'm thinking of ACPI here.

regards,
dan carpenter

#5 lore raw
In reply to Ruben Wauters
Quoted 28 lines · Ruben Wauters
Quoted 20 lines · Christophe Leroy

Le 20/07/2025 à 00:43, Ruben Wauters a écrit :

Quoted 8 lines

[Vous ne recevez pas souvent de courriers de [email protected]. Découvrez pourquoi ceci est important à
https://aka.ms/LearnAboutSenderIdentification ]

The calculations for operand/opcode/macro numbers are done in an identical manner to the already existing ARRAY_SIZE macro in linux/array_size.h

Quoted 8 lines

This patch replaces the sizeof calculations with the macro to make
the
code cleaner and more immediately obvious what it is doing.

---
  arch/powerpc/xmon/ppc-opc.c | 16 ++++++----------

Quoted 6 lines

This file is mostly taken from binutils, refer commit 08d96e0b127e ("powerpc/xmon: Apply binutils changes to upgrade disassembly").

I think your change should be done in binutils then backported to the
kernel. The more we diverge from binutils the worse it is

Quoted 8 lines

While this is somewhat reasonable, the header (linux/array_size.h) is linux specific, and is included through kernel.h

I can probably see if binutils has a similar header, or if they would accept an equivalent header to make the file equivalent, but I'm unsure
if they would

Hello, I have checked the binutils source, and have noticed that binutils already uses the ARRAY_SIZE macro, and this patch actually brings the kernel more in line with the equivalent file in binutils (opcodes/ppc-opc.c)

As such, I would like to request that the patch be applied as-is.

Thank you

Ruben

Quoted 73 lines

Ruben

Quoted 71 lines

Christophe

Quoted 68 lines
  1 file changed, 6 insertions(+), 10 deletions(-)
arch/powerpc/xmon/ppc- renamed from arch/powerpc/xmon/ppc-opc.c +0 -0

opc.c
index 0774d711453e..de9b4236728c 100644

arch/powerpc/xmon/ppc-opc.c +0 -0
@@ -954,8 +954,7 @@ const struct powerpc_operand

powerpc_operands[]
=
    { 0xff, 11, NULL, NULL, PPC_OPERAND_SIGNOPT }, };

-const unsigned int num_powerpc_operands = (sizeof (powerpc_operands)
-                                          / sizeof (powerpc_operands[0]));
+const unsigned int num_powerpc_operands = ARRAY_SIZE(powerpc_operands);

  /* The functions used to insert and extract complicated operands.  */

arch/powerpc/xmon/ppc-opc.c +0 -0
@@ -6968,9 +6967,8 @@ const struct powerpc_opcode

powerpc_opcodes[]
= {
  {"fcfidu.",    XRC(63,974,1),  XRA_MASK, POWER7|PPCA2, PPCVLE,         {FRT, FRB}},
  };

arch/powerpc/xmon/ppc-opc.c +2 -3
-const int powerpc_num_opcodes =
-  sizeof (powerpc_opcodes) / sizeof (powerpc_opcodes[0]);
-
+const int powerpc_num_opcodes = ARRAY_SIZE(powerpc_opcodes);
+

  /* The VLE opcode table.

     The format of this opcode table is the same as the main opcode
table.  */

arch/powerpc/xmon/ppc-opc.c +2 -3
@@ -7207,9 +7205,8 @@ const struct powerpc_opcode vle_opcodes[] =
 {
   {"se_bl",      BD8(58,0,1),    BD8_MASK,       PPCVLE,
 0,              {B8}},
   };
 
-const int vle_num_opcodes =
-  sizeof (vle_opcodes) / sizeof (vle_opcodes[0]);
-
+const int vle_num_opcodes = ARRAY_SIZE(vle_opcodes);
+
   /* The macro table.  This is only used by the assembler.  */

  /* The expressions of the form (-x ! 31) & (x | 31) have the value 0

arch/powerpc/xmon/ppc-opc.c +0 -0
@@ -7276,5 +7273,4 @@ const struct powerpc_macro powerpc_macros[]

=
{
  {"e_clrlslwi",4, PPCVLE, "e_rlwinm %0,%1,%3,(%2)-(%3),31- (%3)"},
  };

arch/powerpc/xmon/ppc-opc.c +1 -3
-const int powerpc_num_macros =
-  sizeof (powerpc_macros) / sizeof (powerpc_macros[0]);
+const int powerpc_num_macros = ARRAY_SIZE(powerpc_macros);
--

2.49.1

Reviewed-by
#6 lore raw

Le 08/08/2025 à 15:54, Ruben Wauters a écrit :

Quoted 39 lines

[Vous ne recevez pas souvent de courriers de [email protected]. Découvrez pourquoi ceci est important à https://aka.ms/LearnAboutSenderIdentification ]

Quoted 28 lines · Ruben Wauters
Quoted 20 lines · Christophe Leroy
Quoted 8 lines · Ruben Wauters

[Vous ne recevez pas souvent de courriers de [email protected]. Découvrez pourquoi ceci est important à
https://aka.ms/LearnAboutSenderIdentification ]

The calculations for operand/opcode/macro numbers are done in an identical manner to the already existing ARRAY_SIZE macro in linux/array_size.h

Quoted 8 lines

This patch replaces the sizeof calculations with the macro to make
the
code cleaner and more immediately obvious what it is doing.

---
   arch/powerpc/xmon/ppc-opc.c | 16 ++++++----------
Quoted 6 lines

This file is mostly taken from binutils, refer commit 08d96e0b127e ("powerpc/xmon: Apply binutils changes to upgrade disassembly").

I think your change should be done in binutils then backported to the
kernel. The more we diverge from binutils the worse it is

Quoted 8 lines

While this is somewhat reasonable, the header (linux/array_size.h) is linux specific, and is included through kernel.h

I can probably see if binutils has a similar header, or if they would accept an equivalent header to make the file equivalent, but I'm unsure
if they would

Quoted 4 lines

Hello, I have checked the binutils source, and have noticed that binutils already uses the ARRAY_SIZE macro, and this patch actually brings the kernel more in line with the equivalent file in binutils (opcodes/ppc-opc.c)

Ok.

Quoted 80 lines

As such, I would like to request that the patch be applied as-is.

Thank you

Ruben

Quoted 73 lines

Ruben

Quoted 71 lines

Christophe

Quoted 68 lines
   1 file changed, 6 insertions(+), 10 deletions(-)
arch/powerpc/xmon/ppc- renamed from arch/powerpc/xmon/ppc-opc.c +0 -0

opc.c
index 0774d711453e..de9b4236728c 100644

arch/powerpc/xmon/ppc-opc.c +0 -0
@@ -954,8 +954,7 @@ const struct powerpc_operand

powerpc_operands[]
=

     { 0xff, 11, NULL, NULL, PPC_OPERAND_SIGNOPT },

};

-const unsigned int num_powerpc_operands = (sizeof (powerpc_operands)
- / sizeof
(powerpc_operands[0]));
+const unsigned int num_powerpc_operands = ARRAY_SIZE(powerpc_operands);

   /* The functions used to insert and extract complicated

operands. */

arch/powerpc/xmon/ppc-opc.c +0 -0
@@ -6968,9 +6967,8 @@ const struct powerpc_opcode

powerpc_opcodes[]

= {
   {"fcfidu.",    XRC(63,974,1),  XRA_MASK, POWER7|PPCA2,

PPCVLE, {FRT, FRB}},
};

arch/powerpc/xmon/ppc-opc.c +2 -3
-const int powerpc_num_opcodes =
-  sizeof (powerpc_opcodes) / sizeof (powerpc_opcodes[0]);
-
+const int powerpc_num_opcodes = ARRAY_SIZE(powerpc_opcodes);
+
   /* The VLE opcode table.
 
      The format of this opcode table is the same as the main

opcode
table. */

arch/powerpc/xmon/ppc-opc.c +2 -3
@@ -7207,9 +7205,8 @@ const struct powerpc_opcode vle_opcodes[] =
 {
   {"se_bl",      BD8(58,0,1),    BD8_MASK,       PPCVLE,
 0,              {B8}},
   };
 
-const int vle_num_opcodes =
-  sizeof (vle_opcodes) / sizeof (vle_opcodes[0]);
-
+const int vle_num_opcodes = ARRAY_SIZE(vle_opcodes);
+
   /* The macro table.  This is only used by the assembler.  */
   /* The expressions of the form (-x ! 31) & (x | 31) have the

value 0

arch/powerpc/xmon/ppc-opc.c +0 -0
@@ -7276,5 +7273,4 @@ const struct powerpc_macro powerpc_macros[]

=

{
   {"e_clrlslwi",4, PPCVLE, "e_rlwinm %0,%1,%3,(%2)-(%3),31-

(%3)"},
};

arch/powerpc/xmon/ppc-opc.c +1 -3
-const int powerpc_num_macros =
-  sizeof (powerpc_macros) / sizeof (powerpc_macros[0]);
+const int powerpc_num_macros = ARRAY_SIZE(powerpc_macros);
--

2.49.1

maintainer Applied
#7 lore raw
In reply to Ruben Wauters
Quoted 8 lines · Ruben Wauters

The calculations for operand/opcode/macro numbers are done in an identical manner to the already existing ARRAY_SIZE macro in linux/array_size.h

This patch replaces the sizeof calculations with the macro to make the code cleaner and more immediately obvious what it is doing.

[...]

Applied to powerpc/next.

[1/1] powerpc/xmon: replace sizeof calculations with ARRAY_SIZE macro

      https://git.kernel.org/powerpc/c/3d9c9e1da9886d91c24d97ca20c854c29212b736

Thanks