Commit 3ad4bb2d authored by Thiemo Seufer's avatar Thiemo Seufer
Browse files

Barf on branches/jumps in branch delay slots. Spotted by Stefan Weil. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2513 c046a42c-6fe2-441c-8c8c-71466251a162
parent 820e00f2

target-mips/translate.c

+13 −5
Original line number Diff line number Diff line
@@ -1368,12 +1368,20 @@ static inline void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) 
static void gen_compute_branch (DisasContext *ctx, uint32_t opc,

                                int rs, int rt, int32_t offset)

{

    target_ulong btarget;

    int blink, bcond;

    target_ulong btarget = -1;

    int blink = 0;

    int bcond = 0;



    if (ctx->hflags & MIPS_HFLAG_BMASK) {

        if (loglevel & CPU_LOG_TB_IN_ASM) {

            fprintf(logfile,

                    "undefined branch in delay slot at pc 0x%08x\n", ctx->pc);

	}

        MIPS_INVAL("branch/jump in bdelay slot");

        generate_exception(ctx, EXCP_RI);

        return;

    }



    btarget = -1;

    blink = 0;

    bcond = 0;

    /* Load needed operands */

    switch (opc) {

    case OPC_BEQ: