mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/hppa: Convert halt/reset insns

Browse Source 
Tested-by: Helge Deller <deller@gmx.de>
Tested-by: Sven Schnelle <svens@stackframe.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2018-02-12 19:46:08 -08:00
parent e8777db7aa
commit 96927adb8d
2 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/hppa/insns.decode
View File

@ -103,6 +103,11 @@ ssm 000000 .......... 000 01101011 t:5 i=%sm_imm
rfi 000000 ----- ----- --- 01100000 00000
rfi_r 000000 ----- ----- --- 01100101 00000
# These are artificial instructions used by QEMU firmware.
# They are allocated from the unassigned instruction space.
halt 1111 1111 1111 1101 1110 1010 1101 0000
reset 1111 1111 1111 1101 1110 1010 1101 0001
####
# Memory Management
####

49
target/hppa/translate.c
View File

@ -2376,20 +2376,27 @@ static bool trans_rfi_r(DisasContext *ctx, arg_rfi_r *a)
return do_rfi(ctx, true);
}
#ifndef CONFIG_USER_ONLY
static bool gen_hlt(DisasContext *ctx, int reset)
static bool trans_halt(DisasContext *ctx, arg_halt *a)
{
CHECK_MOST_PRIVILEGED(EXCP_PRIV_OPR);
#ifndef CONFIG_USER_ONLY
nullify_over(ctx);
if (reset) {
gen_helper_reset(cpu_env);
} else {
gen_helper_halt(cpu_env);
}
gen_helper_halt(cpu_env);
ctx->base.is_jmp = DISAS_NORETURN;
return nullify_end(ctx);
#endif
}
static bool trans_reset(DisasContext *ctx, arg_reset *a)
{
CHECK_MOST_PRIVILEGED(EXCP_PRIV_OPR);
#ifndef CONFIG_USER_ONLY
nullify_over(ctx);
gen_helper_reset(cpu_env);
ctx->base.is_jmp = DISAS_NORETURN;
return nullify_end(ctx);
#endif
}
#endif /* !CONFIG_USER_ONLY */
static bool trans_nop_addrx(DisasContext *ctx, arg_ldst *a)
{
@ -4134,32 +4141,6 @@ static void translate_one(DisasContext *ctx, uint32_t insn)
case 0x2E:
translate_table(ctx, insn, table_fp_fused);
return;
case 0x04: /* spopn */
case 0x05: /* diag */
case 0x0F: /* product specific */
break;
case 0x07: /* unassigned */
case 0x15: /* unassigned */
case 0x1D: /* unassigned */
case 0x37: /* unassigned */
break;
case 0x3F:
#ifndef CONFIG_USER_ONLY
/* Unassigned, but use as system-halt. */
if (insn == 0xfffdead0) {
gen_hlt(ctx, 0); /* halt system */
return;
}
if (insn == 0xfffdead1) {
gen_hlt(ctx, 1); /* reset system */
return;
}
#endif
break;
default:
break;
}
gen_illegal(ctx);
}