proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-08 23:36:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Catch unaligned sc/scd.

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2642 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths 2007-04-09 14:14:21 +00:00
parent 97428a4d84
commit 62c5609aa5
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target-mips/op_mem.c
View File

@ -117,6 +117,10 @@ void glue(op_ll, MEMSUFFIX) (void)
void glue(op_sc, MEMSUFFIX) (void) void glue(op_sc, MEMSUFFIX) (void)
{ {
CALL_FROM_TB0(dump_sc); CALL_FROM_TB0(dump_sc);
if (T0 & 0x3) {
env->CP0_BadVAddr = T0;
CALL_FROM_TB1(do_raise_exception, EXCP_AdES);
}
if (T0 == env->CP0_LLAddr) { if (T0 == env->CP0_LLAddr) {
glue(stl, MEMSUFFIX)(T0, T1); glue(stl, MEMSUFFIX)(T0, T1);
T0 = 1; T0 = 1;
@ -182,6 +186,10 @@ void glue(op_lld, MEMSUFFIX) (void)
void glue(op_scd, MEMSUFFIX) (void) void glue(op_scd, MEMSUFFIX) (void)
{ {
CALL_FROM_TB0(dump_sc); CALL_FROM_TB0(dump_sc);
if (T0 & 0x7) {
env->CP0_BadVAddr = T0;
CALL_FROM_TB1(do_raise_exception, EXCP_AdES);
}
if (T0 == env->CP0_LLAddr) { if (T0 == env->CP0_LLAddr) {
glue(stq, MEMSUFFIX)(T0, T1); glue(stq, MEMSUFFIX)(T0, T1);
T0 = 1; T0 = 1;

2
target-mips/translate.c
View File

@ -714,6 +714,7 @@ static void gen_ldst (DisasContext *ctx, uint32_t opc, int rt,
opn = "sd"; opn = "sd";
break; break;
case OPC_SCD: case OPC_SCD:
save_cpu_state(ctx, 1);
GEN_LOAD_REG_TN(T1, rt); GEN_LOAD_REG_TN(T1, rt);
op_ldst(scd); op_ldst(scd);
opn = "scd"; opn = "scd";
@ -812,6 +813,7 @@ static void gen_ldst (DisasContext *ctx, uint32_t opc, int rt,
opn = "ll"; opn = "ll";
break; break;
case OPC_SC: case OPC_SC:
save_cpu_state(ctx, 1);
GEN_LOAD_REG_TN(T1, rt); GEN_LOAD_REG_TN(T1, rt);
op_ldst(sc); op_ldst(sc);
GEN_STORE_TN_REG(rt, T0); GEN_STORE_TN_REG(rt, T0);