Skip to contentSkip to conversation

sh: kernel: disassemble: Mark expected switch fall-throughs

PATCH Superseded Gustavo A. R. Silva 2 participants 3 messages Aug 10, 2019 SuperH

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Gustavo A. R. Silva

author
#0 lore raw

PATCH 1/1 sh: kernel: disassemble: Mark expected switch fall-throughs

Mark switch cases where we are expecting to fall through.

Fix the following warnings (Building: defconfig sh):

arch/sh/kernel/disassemble.c:478:8: warning: this statement may fall through [-Wimplicit-fallthrough=] arch/sh/kernel/disassemble.c:487:8: warning: this statement may fall through [-Wimplicit-fallthrough=] arch/sh/kernel/disassemble.c:496:8: warning: this statement may fall through [-Wimplicit-fallthrough=]

Signed-off-by Gustavo A. R. Silva <[email protected]>

---

If no one cares, I'll apply this to my tree and queue it up for 5.3-rc4.

 arch/sh/kernel/disassemble.c | 3 +++
 1 file changed, 3 insertions(+)
arch/sh/kernel/disassemble.c +3 -0
index defebf1a9c8a..91c87e9891da 100644
@@ -477,6 +477,7 @@ static void print_sh_insn(u32 memaddr, u16 insn)
 			case FD_REG_N:
 				if (0)
 					goto d_reg_n;
+				/* else, fall through */
 			case F_REG_N:
 				printk("fr%d", rn);
 				break;

@@ -488,6 +489,7 @@ static void print_sh_insn(u32 memaddr, u16 insn)
 					printk("xd%d", rn & ~1);
 					break;
 				}
+				/* else, fall through */
 			d_reg_n:
 			case D_REG_N:
 				printk("dr%d", rn);

@@ -497,6 +499,7 @@ static void print_sh_insn(u32 memaddr, u16 insn)
 					printk("xd%d", rm & ~1);
 					break;
 				}
+				/* else, fall through */
 			case D_REG_M:
 				printk("dr%d", rm);
 				break;
Signature · 1 line
2.22.0
#1 lore raw
Quoted 3 lines · Gustavo A. R. Silva

Mark switch cases where we are expecting to fall through.

Fix the following warnings (Building: defconfig sh):

[]

arch/sh/kernel/disassemble.c

Quoted 1 line
arch/sh/kernel/disassemble.c +0 -0

[]

arch/sh/kernel/disassemble.c static void print_sh_insn(u32 memaddr, u16 insn) · line 479

Quoted 4 lines
arch/sh/kernel/disassemble.c +0 -0
@@ -477,6 +477,7 @@ static void print_sh_insn(u32 memaddr, u16 insn)
 			case FD_REG_N:
 				if (0)
 					goto d_reg_n;

Might as well remove this if (0) goto,
remove the added comment

arch/sh/kernel/disassemble.c static void print_sh_insn(u32 memaddr, u16 insn) · line 493

Quoted 10 lines
arch/sh/kernel/disassemble.c +2 -0
+				/* else, fall through */
 			case F_REG_N:
 				printk("fr%d", rn);
 				break;

@@ -488,6 +489,7 @@ static void print_sh_insn(u32 memaddr, u16 insn)
 					printk("xd%d", rn & ~1);
 					break;
 				}
+				/* else, fall through */
 			d_reg_n:

and remove this only use of d_reg_n

Quoted 10 lines
arch/sh/kernel/disassemble.c +1 -0
 			case D_REG_N:
 				printk("dr%d", rn);

@@ -497,6 +499,7 @@ static void print_sh_insn(u32 memaddr, u16 insn)
 					printk("xd%d", rm & ~1);
 					break;
 				}
+				/* else, fall through */
 			case D_REG_M:
 				printk("dr%d", rm);
 				break;
author
#2 lore raw
Quoted 7 lines · Joe Perches
Quoted 3 lines · Gustavo A. R. Silva

Mark switch cases where we are expecting to fall through.

Fix the following warnings (Building: defconfig sh):

[]

arch/sh/kernel/disassemble.c

Quoted 1 line
arch/sh/kernel/disassemble.c +0 -0

[]

Quoted 8 lines

arch/sh/kernel/disassemble.c static void print_sh_insn(u32 memaddr, u16 insn) · line 479

Quoted 4 lines
arch/sh/kernel/disassemble.c +0 -0
@@ -477,6 +477,7 @@ static void print_sh_insn(u32 memaddr, u16 insn)
 			case FD_REG_N:
 				if (0)
 					goto d_reg_n;

Might as well remove this if (0) goto,
remove the added comment

You're right. I'll respin and stop working this Friday midnight.

Quoted 4 lines
Quoted 4 lines
arch/sh/kernel/disassemble.c +1 -0
+				/* else, fall through */
 			case F_REG_N:
 				printk("fr%d", rn);
 				break;
Quoted 9 lines

arch/sh/kernel/disassemble.c static void print_sh_insn(u32 memaddr, u16 insn) · line 493

Quoted 6 lines
arch/sh/kernel/disassemble.c +1 -0
@@ -488,6 +489,7 @@ static void print_sh_insn(u32 memaddr, u16 insn)
 					printk("xd%d", rn & ~1);
 					break;
 				}
+				/* else, fall through */
 			d_reg_n:

and remove this only use of d_reg_n

Sure.

Thanks
--
Gustavo

Quoted 11 lines
Quoted 10 lines
arch/sh/kernel/disassemble.c +1 -0
 			case D_REG_N:
 				printk("dr%d", rn);

@@ -497,6 +499,7 @@ static void print_sh_insn(u32 memaddr, u16 insn)
 					printk("xd%d", rm & ~1);
 					break;
 				}
+				/* else, fall through */
 			case D_REG_M:
 				printk("dr%d", rm);
 				break;