Commit edfd6da0 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Add a few more branch types to the branch emulator. 



This plugs in some extra encodings for matching more bsr/bsrf/jsr
branches.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 5dd61476

arch/sh/kernel/traps_32.c

+11 −6
Original line number Diff line number Diff line
@@ -702,27 +702,32 @@ static int emulate_branch(unsigned short inst, struct pt_regs* regs) 
	 * jsr: 4x0b: PC=Rn      after PR=PC+4;

	 * rts: 000b: PC=PR;

	 */

	if ((inst & 0xfd00) == 0x8d00) {

	if (((inst & 0xf000) == 0xb000)  ||	/* bsr */

	    ((inst & 0xf0ff) == 0x0003)  ||	/* bsrf */

	    ((inst & 0xf0ff) == 0x400b))	/* jsr */

		regs->pr = regs->pc + 4;



	if ((inst & 0xfd00) == 0x8d00) {	/* bfs, bts */

		regs->pc += SH_PC_8BIT_OFFSET(inst);

		return 0;

	}



	if ((inst & 0xe000) == 0xa000) {

	if ((inst & 0xe000) == 0xa000) {	/* bra, bsr */

		regs->pc += SH_PC_12BIT_OFFSET(inst);

		return 0;

	}



	if ((inst & 0xf0df) == 0x0003) {

	if ((inst & 0xf0df) == 0x0003) {	/* braf, bsrf */

		regs->pc += regs->regs[(inst & 0x0f00) >> 8] + 4;

		return 0;

	}



	if ((inst & 0xf0df) == 0x400b) {

	if ((inst & 0xf0df) == 0x400b) {	/* jmp, jsr */

		regs->pc = regs->regs[(inst & 0x0f00) >> 8];

		return 0;

	}



	if ((inst & 0xffff) == 0x000b) {

	if ((inst & 0xffff) == 0x000b) {	/* rts */

		regs->pc = regs->pr;

		return 0;

	}