Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
---
target/hppa/translate.c | 49 +++++++++++++++---------------------------------
target/hppa/insns.decode | 5 +++++
2 files changed, 20 insertions(+), 34 deletions(-)
diff --git a/target/hppa/translate.c b/target/hppa/translate.c
index 1973923a18..5abe4cd610 100644
--- a/target/hppa/translate.c
+++ b/target/hppa/translate.c
@@ -2384,20 +2384,27 @@ static void trans_rfi_r(DisasContext *ctx, arg_rfi_r
*a, uint32_t insn)
do_rfi(ctx, true);
}
-#ifndef CONFIG_USER_ONLY
-static void gen_hlt(DisasContext *ctx, int reset)
+static void trans_halt(DisasContext *ctx, arg_halt *a, uint32_t insn)
{
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;
nullify_end(ctx);
+#endif
+}
+
+static void trans_reset(DisasContext *ctx, arg_reset *a, uint32_t insn)
+{
+ CHECK_MOST_PRIVILEGED(EXCP_PRIV_OPR);
+#ifndef CONFIG_USER_ONLY
+ nullify_over(ctx);
+ gen_helper_reset(cpu_env);
+ ctx->base.is_jmp = DISAS_NORETURN;
+ nullify_end(ctx);
+#endif
}
-#endif /* !CONFIG_USER_ONLY */
static void trans_nop_addrx(DisasContext *ctx, arg_ldst *a, uint32_t insn)
{
@@ -4126,32 +4133,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);
}
diff --git a/target/hppa/insns.decode b/target/hppa/insns.decode
index 1e4579e080..ddbbaefd83 100644
--- a/target/hppa/insns.decode
+++ b/target/hppa/insns.decode
@@ -101,6 +101,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
####
--
2.14.3
