aboutsummaryrefslogtreecommitdiff
path: root/target-mips/translate.c
diff options
context:
space:
mode:
authorths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2006-12-10 22:08:10 +0000
committerths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2006-12-10 22:08:10 +0000
commitca7c2b1b9f984f622c7495004483016fee61e489 (patch)
tree039162ed6c3010cb651694b5ccc850033fdf3a2d /target-mips/translate.c
parent7d600c804d79e21254a20b953d6bd175597d752d (diff)
Handle invalid accesses as SIGILL for mips/mipsel userland emulation.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2235 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-mips/translate.c')
-rw-r--r--target-mips/translate.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/target-mips/translate.c b/target-mips/translate.c
index 74fa114160..64f7d75650 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -4072,6 +4072,7 @@ void cpu_reset (CPUMIPSState *env)
tlb_flush(env, 1);
/* Minimal init */
+#if !defined(CONFIG_USER_ONLY)
if (env->hflags & MIPS_HFLAG_BMASK) {
/* If the exception was raised from a delay slot,
* come back to the jump. */
@@ -4098,9 +4099,11 @@ void cpu_reset (CPUMIPSState *env)
/* Count register increments in debug mode, EJTAG version 1 */
env->CP0_Debug = (1 << CP0DB_CNT) | (0x1 << CP0DB_VER);
env->CP0_PRid = MIPS_CPU;
+#endif
env->exception_index = EXCP_NONE;
#if defined(CONFIG_USER_ONLY)
env->hflags |= MIPS_HFLAG_UM;
+ env->user_mode_only = 1;
#endif
#ifdef MIPS_USES_FPU
env->fcr0 = MIPS_FCR0;