[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v14 12/33] target-tilegx: Generate SEGV properly
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v14 12/33] target-tilegx: Generate SEGV properly |
Date: |
Mon, 24 Aug 2015 09:17:38 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
linux-user/main.c | 3 +++
target-tilegx/cpu.c | 5 ++++-
target-tilegx/cpu.h | 2 ++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/linux-user/main.c b/linux-user/main.c
index 2d4b0b4..5ca09d2 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -3685,6 +3685,9 @@ void cpu_loop(CPUTLGState *env)
case TILEGX_EXCP_REG_UDN_ACCESS:
gen_sigill_reg(env);
break;
+ case TILEGX_EXCP_SEGV:
+ gen_sigsegv_mapper(env, env->excaddr);
+ break;
default:
fprintf(stderr, "trapnr is %d[0x%x].\n", trapnr, trapnr);
g_assert_not_reached();
diff --git a/target-tilegx/cpu.c b/target-tilegx/cpu.c
index 87aee24..78b73e4 100644
--- a/target-tilegx/cpu.c
+++ b/target-tilegx/cpu.c
@@ -119,7 +119,10 @@ static void tilegx_cpu_do_interrupt(CPUState *cs)
static int tilegx_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw,
int mmu_idx)
{
- cpu_dump_state(cs, stderr, fprintf, 0);
+ TileGXCPU *cpu = TILEGX_CPU(cs);
+
+ cs->exception_index = TILEGX_EXCP_SEGV;
+ cpu->env.excaddr = address;
return 1;
}
diff --git a/target-tilegx/cpu.h b/target-tilegx/cpu.h
index 2c86cd3..3a62d20 100644
--- a/target-tilegx/cpu.h
+++ b/target-tilegx/cpu.h
@@ -60,6 +60,7 @@ enum {
typedef enum {
TILEGX_EXCP_NONE = 0,
TILEGX_EXCP_SYSCALL = 1,
+ TILEGX_EXCP_SEGV = 2,
TILEGX_EXCP_OPCODE_UNKNOWN = 0x101,
TILEGX_EXCP_OPCODE_UNIMPLEMENTED = 0x102,
TILEGX_EXCP_OPCODE_CMPEXCH = 0x103,
@@ -87,6 +88,7 @@ typedef struct CPUTLGState {
#if defined(CONFIG_USER_ONLY)
uint32_t excparam; /* exception parameter */
+ uint64_t excaddr; /* exception address */
#endif
CPU_COMMON
--
2.4.3
- Re: [Qemu-devel] [PATCH v14 07/33] target-tilegx: Fix LDNA_ADD_IMM8_OPCODE_X1, (continued)
- [Qemu-devel] [PATCH v14 05/33] target-tilegx: Modify opcode_tilegx.h to fit QEMU usage, Richard Henderson, 2015/08/24
- [Qemu-devel] [PATCH v14 04/33] target-tilegx: Add opcode basic implementation from Tilera Corporation, Richard Henderson, 2015/08/24
- [Qemu-devel] [PATCH v14 08/33] target-tilegx: Add special register information from Tilera Corporation, Richard Henderson, 2015/08/24
- [Qemu-devel] [PATCH v14 09/33] target-tilegx: Add cpu basic features for linux-user, Richard Henderson, 2015/08/24
- [Qemu-devel] [PATCH v14 10/33] target-tilegx: Add several helpers for instructions translation, Richard Henderson, 2015/08/24
- [Qemu-devel] [PATCH v14 12/33] target-tilegx: Generate SEGV properly,
Richard Henderson <=
- [Qemu-devel] [PATCH v14 14/33] target-tilegx: Handle simple logical operations, Richard Henderson, 2015/08/24
- [Qemu-devel] [PATCH v14 15/33] target-tilegx: Handle arithmetic instructions, Richard Henderson, 2015/08/24
- [Qemu-devel] [PATCH v14 11/33] target-tilegx: Framework for decoding bundles, Richard Henderson, 2015/08/24
- Re: [Qemu-devel] [PATCH v14 11/33] target-tilegx: Framework for decoding bundles, Peter Maydell, 2015/08/29