[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/19] target/hppa: Begin using scripts/decodetree.p
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 02/19] target/hppa: Begin using scripts/decodetree.py |
Date: |
Sat, 17 Feb 2018 12:31:15 -0800 |
Convert the BREAK instruction to start.
Signed-off-by: Richard Henderson <address@hidden>
---
target/hppa/translate.c | 14 +++++++++++---
target/hppa/Makefile.objs | 8 ++++++++
target/hppa/insns.decode | 24 ++++++++++++++++++++++++
3 files changed, 43 insertions(+), 3 deletions(-)
create mode 100644 target/hppa/insns.decode
diff --git a/target/hppa/translate.c b/target/hppa/translate.c
index f72bc84873..a503ae38d4 100644
--- a/target/hppa/translate.c
+++ b/target/hppa/translate.c
@@ -290,6 +290,9 @@ typedef struct DisasContext {
bool psw_n_nonzero;
} DisasContext;
+/* Include the auto-generated decoder. */
+#include "decode.inc.c"
+
/* We are not using a goto_tb (for whatever reason), but have updated
the iaq (for whatever reason), so don't do it again on exit. */
#define DISAS_IAQ_N_UPDATED DISAS_TARGET_0
@@ -1997,7 +2000,7 @@ static void trans_nop(DisasContext *ctx, uint32_t insn,
const DisasInsn *di)
cond_free(&ctx->null_cond);
}
-static void trans_break(DisasContext *ctx, uint32_t insn, const DisasInsn *di)
+static void trans_break(DisasContext *ctx, arg_break *a, uint32_t insn)
{
nullify_over(ctx);
gen_excp_iir(ctx, EXCP_BREAK);
@@ -2320,7 +2323,6 @@ static void gen_hlt(DisasContext *ctx, int reset)
#endif /* !CONFIG_USER_ONLY */
static const DisasInsn table_system[] = {
- { 0x00000000u, 0xfc001fe0u, trans_break },
{ 0x00001820u, 0xffe01fffu, trans_mtsp },
{ 0x00001840u, 0xfc00ffffu, trans_mtctl },
{ 0x016018c0u, 0xffe0ffffu, trans_mtsarcm },
@@ -4508,8 +4510,14 @@ static void translate_table_int(DisasContext *ctx,
uint32_t insn,
static void translate_one(DisasContext *ctx, uint32_t insn)
{
- uint32_t opc = extract32(insn, 26, 6);
+ uint32_t opc;
+ /* Transition to the auto-generated decoder. */
+ if (decode(ctx, insn)) {
+ return;
+ }
+
+ opc = extract32(insn, 26, 6);
switch (opc) {
case 0x00: /* system op */
translate_table(ctx, insn, table_system);
diff --git a/target/hppa/Makefile.objs b/target/hppa/Makefile.objs
index 3359da5341..174f50a96c 100644
--- a/target/hppa/Makefile.objs
+++ b/target/hppa/Makefile.objs
@@ -1,3 +1,11 @@
obj-y += translate.o helper.o cpu.o op_helper.o gdbstub.o mem_helper.o
obj-y += int_helper.o
obj-$(CONFIG_SOFTMMU) += machine.o
+
+DECODETREE = $(SRC_PATH)/scripts/decodetree.py
+
+target/hppa/decode.inc.c: $(SRC_PATH)/target/hppa/insns.decode $(DECODETREE)
+ $(call quiet-command,\
+ $(PYTHON) $(DECODETREE) -o $@ $<, "GEN", $(TARGET_DIR)$@)
+
+target/hppa/translate.o: target/hppa/decode.inc.c
diff --git a/target/hppa/insns.decode b/target/hppa/insns.decode
new file mode 100644
index 0000000000..6c2d3a3a52
--- /dev/null
+++ b/target/hppa/insns.decode
@@ -0,0 +1,24 @@
+#
+# HPPA instruction decode definitions.
+#
+# Copyright (c) 2018 Richard Henderson <address@hidden>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, see <http://www.gnu.org/licenses/>.
+#
+
+####
+# System
+####
+
+break 000000 ----- ----- --- 00000000 -----
--
2.14.3
- [Qemu-devel] [PATCH 00/19] target/hppa: Convert to decodetree.py, Richard Henderson, 2018/02/17
- [Qemu-devel] [PATCH 02/19] target/hppa: Begin using scripts/decodetree.py,
Richard Henderson <=
- [Qemu-devel] [PATCH 03/19] target/hppa: Convert move to/from system registers, Richard Henderson, 2018/02/17
- [Qemu-devel] [PATCH 04/19] target/hppa: Convert remainder of system insns, Richard Henderson, 2018/02/17
- [Qemu-devel] [PATCH 05/19] target/hppa: Unify specializations of OR, Richard Henderson, 2018/02/17
- [Qemu-devel] [PATCH 06/19] target/hppa: Convert memory management insns, Richard Henderson, 2018/02/17
- [Qemu-devel] [PATCH 07/19] target/hppa: Convert arithmetic/logical insns, Richard Henderson, 2018/02/17
- [Qemu-devel] [PATCH 08/19] target/hppa: Convert indexed memory insns, Richard Henderson, 2018/02/17
- [Qemu-devel] [PATCH 09/19] target/hppa: Convert fp multiply-add, Richard Henderson, 2018/02/17
- [Qemu-devel] [PATCH 01/19] target/hppa: Use DisasContextBase.is_jmp, Richard Henderson, 2018/02/17
- [Qemu-devel] [PATCH 10/19] target/hppa: Convert conditional branches, Richard Henderson, 2018/02/17