From 62c5609aa537a9c7f3c70e4baa5e67060368baa3 Mon Sep 17 00:00:00 2001
From: ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Mon, 9 Apr 2007 14:14:21 +0000
Subject: [PATCH] Catch unaligned sc/scd.
---
target-mips/op_mem.c | 8 ++++++++
target-mips/translate.c | 2 ++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/target-mips/op_mem.c b/target-mips/op_mem.c
index a199172..19373cf 100644
--- a/target-mips/op_mem.c
+++ b/target-mips/op_mem.c
@@ -117,6 +117,10 @@ void glue(op_ll, MEMSUFFIX) (void)
void glue(op_sc, MEMSUFFIX) (void)
{
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) {
glue(stl, MEMSUFFIX)(T0, T1);
T0 = 1;
@@ -182,6 +186,10 @@ void glue(op_lld, MEMSUFFIX) (void)
void glue(op_scd, MEMSUFFIX) (void)
{
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) {
glue(stq, MEMSUFFIX)(T0, T1);
T0 = 1;
diff --git a/target-mips/translate.c b/target-mips/translate.c
index 57527a5..e5eff06 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -714,6 +714,7 @@ static void gen_ldst (DisasContext *ctx, uint32_t opc, int rt,
opn = "sd";
break;
case OPC_SCD:
+ save_cpu_state(ctx, 1);
GEN_LOAD_REG_TN(T1, rt);
op_ldst(scd);
opn = "scd";
@@ -812,6 +813,7 @@ static void gen_ldst (DisasContext *ctx, uint32_t opc, int rt,
opn = "ll";
break;
case OPC_SC:
+ save_cpu_state(ctx, 1);
GEN_LOAD_REG_TN(T1, rt);
op_ldst(sc);
GEN_STORE_TN_REG(rt, T0);
--
libgit2 0.23.3