mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lwu support - generate exception if unaligned pc (Marius Groeger)

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2025 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2006-06-26 20:02:45 +00:00
parent 567d4107a6
commit d796321b6b
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target-mips/op_mem.c
View File

@ -61,6 +61,12 @@ void glue(op_lw, MEMSUFFIX) (void)
RETURN(); RETURN();
} }
void glue(op_lwu, MEMSUFFIX) (void)
{
T0 = glue(ldl, MEMSUFFIX)(T0);
RETURN();
}
void glue(op_sw, MEMSUFFIX) (void) void glue(op_sw, MEMSUFFIX) (void)
{ {
glue(stl, MEMSUFFIX)(T0, T1); glue(stl, MEMSUFFIX)(T0, T1);

17
target-mips/translate.c
View File

@ -97,6 +97,7 @@ enum {
OPC_LBU = 0x24, OPC_LBU = 0x24,
OPC_LHU = 0x25, OPC_LHU = 0x25,
OPC_LWR = 0x26, OPC_LWR = 0x26,
OPC_LWU = 0x27,
OPC_SB = 0x28, OPC_SB = 0x28,
OPC_SH = 0x29, OPC_SH = 0x29,
OPC_SWL = 0x2A, OPC_SWL = 0x2A,
@ -495,6 +496,7 @@ OP_ST_TABLE(dl);
OP_ST_TABLE(dr); OP_ST_TABLE(dr);
#endif #endif
OP_LD_TABLE(w); OP_LD_TABLE(w);
OP_LD_TABLE(wu);
OP_LD_TABLE(wl); OP_LD_TABLE(wl);
OP_LD_TABLE(wr); OP_LD_TABLE(wr);
OP_ST_TABLE(w); OP_ST_TABLE(w);
@ -580,6 +582,11 @@ static void gen_ldst (DisasContext *ctx, uint16_t opc, int rt,
GEN_STORE_TN_REG(rt, T0); GEN_STORE_TN_REG(rt, T0);
opn = "lw"; opn = "lw";
break; break;
case OPC_LWU:
op_ldst(lwu);
GEN_STORE_TN_REG(rt, T0);
opn = "lwu";
break;
case OPC_SW: case OPC_SW:
#if defined (MIPS_HAS_UNALIGNED_LS) #if defined (MIPS_HAS_UNALIGNED_LS)
case OPC_USW: case OPC_USW:
@ -1356,6 +1363,7 @@ static void gen_cp0 (DisasContext *ctx, uint16_t opc, int rt, int rd)
generate_exception_err (ctx, EXCP_CpU, 0); generate_exception_err (ctx, EXCP_CpU, 0);
return; return;
} }
switch (opc) { switch (opc) {
case OPC_MFC0: case OPC_MFC0:
if (rt == 0) { if (rt == 0) {
@ -1886,6 +1894,12 @@ static void decode_opc (DisasContext *ctx)
uint16_t op, op1; uint16_t op, op1;
int16_t imm; int16_t imm;
/* make sure instructions are on a word boundary */
if (ctx->pc & 0x3) {
generate_exception(ctx, EXCP_AdEL);
return;
}
if ((ctx->hflags & MIPS_HFLAG_BMASK) == MIPS_HFLAG_BL) { if ((ctx->hflags & MIPS_HFLAG_BMASK) == MIPS_HFLAG_BL) {
/* Handle blikely not taken case */ /* Handle blikely not taken case */
MIPS_DEBUG("blikely condition (%08x)", ctx->pc + 4); MIPS_DEBUG("blikely condition (%08x)", ctx->pc + 4);
@ -2041,8 +2055,7 @@ static void decode_opc (DisasContext *ctx)
case 0x14 ... 0x17: case 0x14 ... 0x17:
gen_compute_branch(ctx, op, rs, rt, imm << 2); gen_compute_branch(ctx, op, rs, rt, imm << 2);
return; return;
case 0x20 ... 0x26: /* Load and stores */ case 0x20 ... 0x2E: /* Load and stores */
case 0x28 ... 0x2E:
case 0x30: case 0x30:
case 0x38: case 0x38:
gen_ldst(ctx, op, rt, rs, imm); gen_ldst(ctx, op, rt, rs, imm);