diff --git a/exec-all.h b/exec-all.h
index 57086f3defb06834695cc5bafd96651e86aaa03a..861688bd5c3ebbd55134149e1e7e4205c1266377 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -608,7 +608,7 @@ static inline target_ulong get_phys_addr_code(CPUState *env, target_ulong addr)
     }
     pd = env->tlb_table[mmu_idx][index].addr_code & ~TARGET_PAGE_MASK;
     if (pd > IO_MEM_ROM && !(pd & IO_MEM_ROMD)) {
-#ifdef TARGET_SPARC
+#if defined(TARGET_SPARC) || defined(TARGET_MIPS)
         do_unassigned_access(addr, 0, 1, 0);
 #else
         cpu_abort(env, "Trying to execute code outside RAM or ROM at 0x" TARGET_FMT_lx "\n", addr);
diff --git a/target-mips/cpu.h b/target-mips/cpu.h
index 35bf2fbf6f5a45ef9306a00677c9ff6572ef6421..363fcd866c52810ca3d8ff2f5c73123f8872112c 100644
--- a/target-mips/cpu.h
+++ b/target-mips/cpu.h
@@ -479,6 +479,9 @@ int mips_find_by_name (const unsigned char *name, mips_def_t **def);
 void mips_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
 int cpu_mips_register (CPUMIPSState *env, mips_def_t *def);
 
+void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,
+                          int unused);
+
 #define CPUState CPUMIPSState
 #define cpu_init cpu_mips_init
 #define cpu_exec cpu_mips_exec
diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index 6d7f750d0fe14612dd2cf796eba2ccebd392aadd..f3e01202e6e49fe16cc877ae664228ce4c290c1d 100644
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -591,6 +591,14 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr)
     env = saved_env;
 }
 
+void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,
+                          int unused)
+{
+    if (is_exec)
+        do_raise_exception(EXCP_IBE);
+    else
+        do_raise_exception(EXCP_DBE);
+}
 #endif
 
 /* Complex FPU operations which may need stack space. */