OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target-tilegx: Generate SEGV properly 

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2015-08-21 11:49:38 -07:00
parent 8fd29dd72b
commit 9b9dc7acec
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
linux-user/main.c
View File

@ -3460,6 +3460,9 @@ void cpu_loop(CPUTLGState *env)
case TILEGX_EXCP_REG_UDN_ACCESS: case TILEGX_EXCP_REG_UDN_ACCESS:
gen_sigill_reg(env); gen_sigill_reg(env);
break; break;
case TILEGX_EXCP_SEGV:
gen_sigsegv_maperr(env, env->excaddr);
break;
default: default:
fprintf(stderr, "trapnr is %d[0x%x].\n", trapnr, trapnr); fprintf(stderr, "trapnr is %d[0x%x].\n", trapnr, trapnr);
g_assert_not_reached(); g_assert_not_reached();

5
target-tilegx/cpu.c
View File

@ -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, static int tilegx_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw,
int mmu_idx) 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; return 1;
} }

2
target-tilegx/cpu.h
View File

@ -60,6 +60,7 @@ enum {
typedef enum { typedef enum {
TILEGX_EXCP_NONE = 0, TILEGX_EXCP_NONE = 0,
TILEGX_EXCP_SYSCALL = 1, TILEGX_EXCP_SYSCALL = 1,
TILEGX_EXCP_SEGV = 2,
TILEGX_EXCP_OPCODE_UNKNOWN = 0x101, TILEGX_EXCP_OPCODE_UNKNOWN = 0x101,
TILEGX_EXCP_OPCODE_UNIMPLEMENTED = 0x102, TILEGX_EXCP_OPCODE_UNIMPLEMENTED = 0x102,
TILEGX_EXCP_OPCODE_CMPEXCH = 0x103, TILEGX_EXCP_OPCODE_CMPEXCH = 0x103,
@ -87,6 +88,7 @@ typedef struct CPUTLGState {
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)
uint32_t excparam; /* exception parameter */ uint32_t excparam; /* exception parameter */
uint64_t excaddr; /* exception address */
#endif #endif
CPU_COMMON CPU_COMMON