Commit 9b9fae8b authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Rich Felker
Browse files

sh: kernel: disassemble: Fix broken lines in disassembly dumps 



Rejoin the broken lines by using pr_cont().
Convert the remaining printk() calls to pr_*() while at it.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarRich Felker <dalias@libc.org>
parent f6bed866

arch/sh/kernel/disassemble.c

+52 −51
Original line number Diff line number Diff line
@@ -376,148 +376,148 @@ static void print_sh_insn(u32 memaddr, u16 insn) 
		}



	ok:

		printk("%-8s  ", op->name);

		pr_cont("%-8s  ", op->name);

		lastsp = (op->arg[0] == A_END);

		disp_pc = 0;

		for (n = 0; n < 6 && op->arg[n] != A_END; n++) {

			if (n && op->arg[1] != A_END)

				printk(", ");

				pr_cont(", ");

			switch (op->arg[n]) {

			case A_IMM:

				printk("#%d", (char)(imm));

				pr_cont("#%d", (char)(imm));

				break;

			case A_R0:

				printk("r0");

				pr_cont("r0");

				break;

			case A_REG_N:

				printk("r%d", rn);

				pr_cont("r%d", rn);

				break;

			case A_INC_N:

				printk("@r%d+", rn);

				pr_cont("@r%d+", rn);

				break;

			case A_DEC_N:

				printk("@-r%d", rn);

				pr_cont("@-r%d", rn);

				break;

			case A_IND_N:

				printk("@r%d", rn);

				pr_cont("@r%d", rn);

				break;

			case A_DISP_REG_N:

				printk("@(%d,r%d)", imm, rn);

				pr_cont("@(%d,r%d)", imm, rn);

				break;

			case A_REG_M:

				printk("r%d", rm);

				pr_cont("r%d", rm);

				break;

			case A_INC_M:

				printk("@r%d+", rm);

				pr_cont("@r%d+", rm);

				break;

			case A_DEC_M:

				printk("@-r%d", rm);

				pr_cont("@-r%d", rm);

				break;

			case A_IND_M:

				printk("@r%d", rm);

				pr_cont("@r%d", rm);

				break;

			case A_DISP_REG_M:

				printk("@(%d,r%d)", imm, rm);

				pr_cont("@(%d,r%d)", imm, rm);

				break;

			case A_REG_B:

				printk("r%d_bank", rb);

				pr_cont("r%d_bank", rb);

				break;

			case A_DISP_PC:

				disp_pc = 1;

				disp_pc_addr = imm + 4 + (memaddr & relmask);

				printk("%08x <%pS>", disp_pc_addr,

				pr_cont("%08x <%pS>", disp_pc_addr,

					(void *)disp_pc_addr);

				break;

			case A_IND_R0_REG_N:

				printk("@(r0,r%d)", rn);

				pr_cont("@(r0,r%d)", rn);

				break;

			case A_IND_R0_REG_M:

				printk("@(r0,r%d)", rm);

				pr_cont("@(r0,r%d)", rm);

				break;

			case A_DISP_GBR:

				printk("@(%d,gbr)",imm);

				pr_cont("@(%d,gbr)", imm);

				break;

			case A_R0_GBR:

				printk("@(r0,gbr)");

				pr_cont("@(r0,gbr)");

				break;

			case A_BDISP12:

			case A_BDISP8:

				printk("%08x", imm + memaddr);

				pr_cont("%08x", imm + memaddr);

				break;

			case A_SR:

				printk("sr");

				pr_cont("sr");

				break;

			case A_GBR:

				printk("gbr");

				pr_cont("gbr");

				break;

			case A_VBR:

				printk("vbr");

				pr_cont("vbr");

				break;

			case A_SSR:

				printk("ssr");

				pr_cont("ssr");

				break;

			case A_SPC:

				printk("spc");

				pr_cont("spc");

				break;

			case A_MACH:

				printk("mach");

				pr_cont("mach");

				break;

			case A_MACL:

				printk("macl");

				pr_cont("macl");

				break;

			case A_PR:

				printk("pr");

				pr_cont("pr");

				break;

			case A_SGR:

				printk("sgr");

				pr_cont("sgr");

				break;

			case A_DBR:

				printk("dbr");

				pr_cont("dbr");

				break;

			case FD_REG_N:

			case F_REG_N:

				printk("fr%d", rn);

				pr_cont("fr%d", rn);

				break;

			case F_REG_M:

				printk("fr%d", rm);

				pr_cont("fr%d", rm);

				break;

			case DX_REG_N:

				if (rn & 1) {

					printk("xd%d", rn & ~1);

					pr_cont("xd%d", rn & ~1);

					break;

				}

				/* else, fall through */

			case D_REG_N:

				printk("dr%d", rn);

				pr_cont("dr%d", rn);

				break;

			case DX_REG_M:

				if (rm & 1) {

					printk("xd%d", rm & ~1);

					pr_cont("xd%d", rm & ~1);

					break;

				}

				/* else, fall through */

			case D_REG_M:

				printk("dr%d", rm);

				pr_cont("dr%d", rm);

				break;

			case FPSCR_M:

			case FPSCR_N:

				printk("fpscr");

				pr_cont("fpscr");

				break;

			case FPUL_M:

			case FPUL_N:

				printk("fpul");

				pr_cont("fpul");

				break;

			case F_FR0:

				printk("fr0");

				pr_cont("fr0");

				break;

			case V_REG_N:

				printk("fv%d", rn*4);

				pr_cont("fv%d", rn*4);

				break;

			case V_REG_M:

				printk("fv%d", rm*4);

				pr_cont("fv%d", rm*4);

				break;

			case XMTRX_M4:

				printk("xmtrx");

				pr_cont("xmtrx");

				break;

			default:

				return;
@@ -532,7 +532,7 @@ static void print_sh_insn(u32 memaddr, u16 insn) 
			else

				__get_user(val, (u32 *)disp_pc_addr);



			printk("  ! %08x <%pS>", val, (void *)val);

			pr_cont("  ! %08x <%pS>", val, (void *)val);

		}



		return;
@@ -541,7 +541,7 @@ static void print_sh_insn(u32 memaddr, u16 insn) 


	}



	printk(".word 0x%x%x%x%x", nibs[0], nibs[1], nibs[2], nibs[3]);

	pr_info(".word 0x%x%x%x%x", nibs[0], nibs[1], nibs[2], nibs[3]);

}



void show_code(struct pt_regs *regs)
@@ -552,20 +552,21 @@ void show_code(struct pt_regs *regs) 
	if (regs->pc & 0x1)

		return;



	printk("Code:\n");

	pr_info("Code:\n");



	for (i = -3 ; i < 6 ; i++) {

		unsigned short insn;



		if (__get_user(insn, pc + i)) {

			printk(" (Bad address in pc)\n");

			pr_err(" (Bad address in pc)\n");

			break;

		}



		printk("%s%08lx:  ", (i ? "  ": "->"), (unsigned long)(pc + i));

		pr_info("%s%08lx:  ", (i ? "  " : "->"),

			(unsigned long)(pc + i));

		print_sh_insn((unsigned long)(pc + i), insn);

		printk("\n");

		pr_cont("\n");

	}



	printk("\n");

	pr_info("\n");

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE