Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-09 01:50:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

target/hppa: Disable gateway page emulation for system mode

Browse Source 
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2017-10-09 09:51:30 -07:00
parent fa57e3274d
commit ba1d0b4482
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
target/hppa/translate.c
View File

@ -1543,6 +1543,7 @@ static DisasJumpType do_ibranch(DisasContext *ctx, TCGv dest,
return DISAS_NEXT; return DISAS_NEXT;
} }
#ifdef CONFIG_USER_ONLY
/* On Linux, page zero is normally marked execute only + gateway. /* On Linux, page zero is normally marked execute only + gateway.
Therefore normal read or write is supposed to fail, but specific Therefore normal read or write is supposed to fail, but specific
offsets have kernel code mapped to raise permissions to implement offsets have kernel code mapped to raise permissions to implement
@ -1600,6 +1601,7 @@ static DisasJumpType do_page_zero(DisasContext *ctx)
return DISAS_NORETURN; return DISAS_NORETURN;
} }
} }
#endif
static DisasJumpType trans_nop(DisasContext *ctx, uint32_t insn, static DisasJumpType trans_nop(DisasContext *ctx, uint32_t insn,
const DisasInsn *di) const DisasInsn *di)
@ -3787,10 +3789,13 @@ static void hppa_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs)
int i, n; int i, n;
/* Execute one insn. */ /* Execute one insn. */
#ifdef CONFIG_USER_ONLY
if (ctx->iaoq_f < TARGET_PAGE_SIZE) { if (ctx->iaoq_f < TARGET_PAGE_SIZE) {
ret = do_page_zero(ctx); ret = do_page_zero(ctx);
assert(ret != DISAS_NEXT); assert(ret != DISAS_NEXT);
} else { } else
#endif
{
/* Always fetch the insn, even if nullified, so that we check /* Always fetch the insn, even if nullified, so that we check
the page permissions for execute. */ the page permissions for execute. */
uint32_t insn = cpu_ldl_code(env, ctx->iaoq_f); uint32_t insn = cpu_ldl_code(env, ctx->iaoq_f);
@ -3885,25 +3890,27 @@ static void hppa_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs)
static void hppa_tr_disas_log(const DisasContextBase *dcbase, CPUState *cs) static void hppa_tr_disas_log(const DisasContextBase *dcbase, CPUState *cs)
{ {
TranslationBlock *tb = dcbase->tb; TranslationBlock *tb = dcbase->tb;
target_ulong pc = tb->pc;
switch (tb->pc) { #ifdef CONFIG_USER_ONLY
switch (pc) {
case 0x00: case 0x00:
qemu_log("IN:\n0x00000000: (null)\n"); qemu_log("IN:\n0x00000000: (null)\n");
break; return;
case 0xb0: case 0xb0:
qemu_log("IN:\n0x000000b0: light-weight-syscall\n"); qemu_log("IN:\n0x000000b0: light-weight-syscall\n");
break; return;
case 0xe0: case 0xe0:
qemu_log("IN:\n0x000000e0: set-thread-pointer-syscall\n"); qemu_log("IN:\n0x000000e0: set-thread-pointer-syscall\n");
break; return;
case 0x100: case 0x100:
qemu_log("IN:\n0x00000100: syscall\n"); qemu_log("IN:\n0x00000100: syscall\n");
break; return;
default:
qemu_log("IN: %s\n", lookup_symbol(tb->pc));
log_target_disas(cs, tb->pc, tb->size);
break;
} }
#endif
qemu_log("IN: %s\n", lookup_symbol(pc));
log_target_disas(cs, pc, tb->size);
} }
static const TranslatorOps hppa_tr_ops = { static const TranslatorOps hppa_tr_ops = {