summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--exec.c12
-rw-r--r--target-cris/cpu.h2
-rw-r--r--target-cris/op_helper.c7
3 files changed, 6 insertions, 15 deletions
diff --git a/exec.c b/exec.c
index 44f6a42556..7b333deaf5 100644
--- a/exec.c
+++ b/exec.c
@@ -2379,7 +2379,7 @@ static uint32_t unassigned_mem_readb(void *opaque, target_phys_addr_t addr)
#ifdef DEBUG_UNASSIGNED
printf("Unassigned mem read " TARGET_FMT_plx "\n", addr);
#endif
-#if defined(TARGET_SPARC) || defined(TARGET_CRIS)
+#if defined(TARGET_SPARC)
do_unassigned_access(addr, 0, 0, 0, 1);
#endif
return 0;
@@ -2390,7 +2390,7 @@ static uint32_t unassigned_mem_readw(void *opaque, target_phys_addr_t addr)
#ifdef DEBUG_UNASSIGNED
printf("Unassigned mem read " TARGET_FMT_plx "\n", addr);
#endif
-#if defined(TARGET_SPARC) || defined(TARGET_CRIS)
+#if defined(TARGET_SPARC)
do_unassigned_access(addr, 0, 0, 0, 2);
#endif
return 0;
@@ -2401,7 +2401,7 @@ static uint32_t unassigned_mem_readl(void *opaque, target_phys_addr_t addr)
#ifdef DEBUG_UNASSIGNED
printf("Unassigned mem read " TARGET_FMT_plx "\n", addr);
#endif
-#if defined(TARGET_SPARC) || defined(TARGET_CRIS)
+#if defined(TARGET_SPARC)
do_unassigned_access(addr, 0, 0, 0, 4);
#endif
return 0;
@@ -2412,7 +2412,7 @@ static void unassigned_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_
#ifdef DEBUG_UNASSIGNED
printf("Unassigned mem write " TARGET_FMT_plx " = 0x%x\n", addr, val);
#endif
-#if defined(TARGET_SPARC) || defined(TARGET_CRIS)
+#if defined(TARGET_SPARC)
do_unassigned_access(addr, 1, 0, 0, 1);
#endif
}
@@ -2422,7 +2422,7 @@ static void unassigned_mem_writew(void *opaque, target_phys_addr_t addr, uint32_
#ifdef DEBUG_UNASSIGNED
printf("Unassigned mem write " TARGET_FMT_plx " = 0x%x\n", addr, val);
#endif
-#if defined(TARGET_SPARC) || defined(TARGET_CRIS)
+#if defined(TARGET_SPARC)
do_unassigned_access(addr, 1, 0, 0, 2);
#endif
}
@@ -2432,7 +2432,7 @@ static void unassigned_mem_writel(void *opaque, target_phys_addr_t addr, uint32_
#ifdef DEBUG_UNASSIGNED
printf("Unassigned mem write " TARGET_FMT_plx " = 0x%x\n", addr, val);
#endif
-#if defined(TARGET_SPARC) || defined(TARGET_CRIS)
+#if defined(TARGET_SPARC)
do_unassigned_access(addr, 1, 0, 0, 4);
#endif
}
diff --git a/target-cris/cpu.h b/target-cris/cpu.h
index 44a98e46a2..cf61a3d660 100644
--- a/target-cris/cpu.h
+++ b/target-cris/cpu.h
@@ -167,8 +167,6 @@ void do_interrupt(CPUCRISState *env);
is returned if the signal was handled by the virtual CPU. */
int cpu_cris_signal_handler(int host_signum, void *pinfo,
void *puc);
-void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,
- int is_asi, int size);
enum {
CC_OP_DYNAMIC, /* Use env->cc_op */
diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c
index a681f84f35..541237bb57 100644
--- a/target-cris/op_helper.c
+++ b/target-cris/op_helper.c
@@ -243,13 +243,6 @@ void helper_rfn(void)
env->pregs[PR_CCS] |= M_FLAG;
}
-void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,
- int is_asi, int size)
-{
- D(printf("%s addr=%x w=%d ex=%d asi=%d, size=%d\n",
- __func__, addr, is_write, is_exec, is_asi, size));
-}
-
static void evaluate_flags_writeback(uint32_t flags)
{
int x;