From nobody Fri May 9 00:25:04 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1662018539; cv=none;
d=zohomail.com; s=zohoarc;
b=NUm9Rxu9csjCJar1gzor+Ujo66jQol1ZA+XK/D0WYWVva02oPiaaRs4dM3EfKq+v9cN9qqsEW9PC1OSEs34azJH6EMLk9xe3o7+iYDAQG/QhMd/YIlO67aP7KeFcwml1I6by/iaRwSl+LuWLUPJFH5B1qZ8IhEz4JFp9N74A6es=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1662018539;
h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=9DNRaOcHSuO84yjorT/O7+HarXh4HMmzCopA5+J/Upo=;
b=hRbUwxQiwvBT2j8hE6FhBYYV3Wk/6h96kH+rZQ4koY32uPBxIRTyAX0oHBnAWAxu+2+6vjVgaLMH+tSxMbcJqOeVIgAh72uNlQp4IFmS8L3BEl1Lbe2j+bdmzI5Jz16Y2ubq7488Mzczx91DoWPt8i2nT0vNje7URdMvO9m79Ak=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<richard.henderson@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1662018539379535.928056597202;
Thu, 1 Sep 2022 00:48:59 -0700 (PDT)
Received: from localhost ([::1]:39072 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1oTewb-000805-Q8
for importer@patchew.org; Thu, 01 Sep 2022 03:48:57 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:50434)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>)
id 1oTe4h-0006Lp-2i
for qemu-devel@nongnu.org; Thu, 01 Sep 2022 02:53:15 -0400
Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:33337)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>)
id 1oTe4e-0003PW-18
for qemu-devel@nongnu.org; Thu, 01 Sep 2022 02:53:14 -0400
Received: by mail-wr1-x434.google.com with SMTP id k9so21053402wri.0
for <qemu-devel@nongnu.org>; Wed, 31 Aug 2022 23:53:11 -0700 (PDT)
Received: from stoup.. ([87.192.221.83]) by smtp.gmail.com with ESMTPSA id
a6-20020a5d4d46000000b00226dedf1ab7sm8308153wru.76.2022.08.31.23.53.07
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 31 Aug 2022 23:53:08 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc;
bh=9DNRaOcHSuO84yjorT/O7+HarXh4HMmzCopA5+J/Upo=;
b=a0IQrNldV46cPkpL1JX8n9crn834dYZNZ6o8yCdXg5XAFSpmzJmBFIhSPGk03Vlpin
uNT2pxOEojHa/9r5YFgObQ41/MjDBx5zpustJ1WRpF+M36qUlzqOodUI7UwRWFgOixPG
yCfZeL+kGNbX0xLRfkesP+HrpumfH/+R7Q/MiG9IxHrwMCItfRAhH2RTxlSsA7DGiEkI
UuD2czRme2SCT0P3WVvOCIw/FXVqWY1yFzjpE/01g4IxXPjbnhn82OV1IIUK9SjEOist
NTtplERdSorL+o2Y33hrJldSbyjadmqECDyL0tlwZeeC82RIVVY8lok7/CKUNovucoX2
qKQA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc;
bh=9DNRaOcHSuO84yjorT/O7+HarXh4HMmzCopA5+J/Upo=;
b=IyGPpeiqxpDCynudIJAaq38/62mpzui8qMbB+G0JkKk2mAHnTxbo3mdGSpFvr9QyEY
xlpfMqojcj6umJWdZcIi/FzzPHhuzVH8TaXGGPU8PG7Q8P1L1MxikqrVXSzzZUp2Rqu4
Y9Z2DPulThmqzTcWMZQCGfo60/JDKr/AekmO5egw+cfgZJwMGdlynjl+KfySbkwsbaTx
8aAXjdykuGRtqgxDLqR2QP0T6zMMJ5JlZvy6imaMfDFfIrvuWLCSBoKVyS4qj4rVNS+1
LF9LI3FVO7Bv8kZF10A9szEj7DyWmcPJgw68C7lwVYFDNWrI0ZEtgTIgobSmMzvBPjQM
e7IQ==
X-Gm-Message-State: ACgBeo03OnenGZCTttNml9xsmaXzeRfVWRGBAwil59bWtwB/vxsEbHxF
vWmPSLDZ4ICRfHFj+WyNdrLTZMACtbEz9exz
X-Google-Smtp-Source:
AA6agR55OpJ1UMa+HtCo2oodn3YHv3QHqKwUezr5ify0JlKgN1ZQIgnNJxM/uEE6Lrb4rsviH3hu5g==
X-Received: by 2002:a5d:4cc6:0:b0:226:df71:fd54 with SMTP id
c6-20020a5d4cc6000000b00226df71fd54mr8678901wrt.436.1662015190404;
Wed, 31 Aug 2022 23:53:10 -0700 (PDT)
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: Alistair Francis <alistair.francis@wdc.com>,
Ilya Leoshkevich <iii@linux.ibm.com>
Subject: [PULL 15/20] accel/tcg: Add pc and host_pc params to
gen_intermediate_code
Date: Thu, 1 Sep 2022 07:52:05 +0100
Message-Id: <20220901065210.117081-20-richard.henderson@linaro.org>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20220901065210.117081-1-richard.henderson@linaro.org>
References: <20220901065210.117081-1-richard.henderson@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::434;
envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x434.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1662018539766100001
Content-Type: text/plain; charset="utf-8"
Pass these along to translator_loop -- pc may be used instead
of tb->pc, and host_pc is currently unused. Adjust all targets
at one time.
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
Tested-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/exec-all.h | 1 -
include/exec/translator.h | 24 ++++++++++++++++++++----
accel/tcg/translate-all.c | 6 ++++--
accel/tcg/translator.c | 9 +++++----
target/alpha/translate.c | 5 +++--
target/arm/translate.c | 5 +++--
target/avr/translate.c | 5 +++--
target/cris/translate.c | 5 +++--
target/hexagon/translate.c | 6 ++++--
target/hppa/translate.c | 5 +++--
target/i386/tcg/translate.c | 5 +++--
target/loongarch/translate.c | 6 ++++--
target/m68k/translate.c | 5 +++--
target/microblaze/translate.c | 5 +++--
target/mips/tcg/translate.c | 5 +++--
target/nios2/translate.c | 5 +++--
target/openrisc/translate.c | 6 ++++--
target/ppc/translate.c | 5 +++--
target/riscv/translate.c | 5 +++--
target/rx/translate.c | 5 +++--
target/s390x/tcg/translate.c | 5 +++--
target/sh4/translate.c | 5 +++--
target/sparc/translate.c | 5 +++--
target/tricore/translate.c | 6 ++++--
target/xtensa/translate.c | 6 ++++--
25 files changed, 97 insertions(+), 53 deletions(-)
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 9f35e3b7a9..bcad607c4e 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -39,7 +39,6 @@ typedef ram_addr_t tb_page_addr_t;
#define TB_PAGE_ADDR_FMT RAM_ADDR_FMT
#endif
=20
-void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in=
sns);
void restore_state_to_opc(CPUArchState *env, TranslationBlock *tb,
target_ulong *data);
=20
diff --git a/include/exec/translator.h b/include/exec/translator.h
index 45b9268ca4..69db0f5c21 100644
--- a/include/exec/translator.h
+++ b/include/exec/translator.h
@@ -26,6 +26,19 @@
#include "exec/translate-all.h"
#include "tcg/tcg.h"
=20
+/**
+ * gen_intermediate_code
+ * @cpu: cpu context
+ * @tb: translation block
+ * @max_insns: max number of instructions to translate
+ * @pc: guest virtual program counter address
+ * @host_pc: host physical program counter address
+ *
+ * This function must be provided by the target, which should create
+ * the target-specific DisasContext, and then invoke translator_loop.
+ */
+void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in=
sns,
+ target_ulong pc, void *host_pc);
=20
/**
* DisasJumpType:
@@ -123,11 +136,13 @@ typedef struct TranslatorOps {
=20
/**
* translator_loop:
- * @ops: Target-specific operations.
- * @db: Disassembly context.
* @cpu: Target vCPU.
* @tb: Translation block.
* @max_insns: Maximum number of insns to translate.
+ * @pc: guest virtual program counter address
+ * @host_pc: host physical program counter address
+ * @ops: Target-specific operations.
+ * @db: Disassembly context.
*
* Generic translator loop.
*
@@ -141,8 +156,9 @@ typedef struct TranslatorOps {
* - When single-stepping is enabled (system-wide or on the current vCPU).
* - When too many instructions have been translated.
*/
-void translator_loop(const TranslatorOps *ops, DisasContextBase *db,
- CPUState *cpu, TranslationBlock *tb, int max_insns);
+void translator_loop(CPUState *cpu, TranslationBlock *tb, int max_insns,
+ target_ulong pc, void *host_pc,
+ const TranslatorOps *ops, DisasContextBase *db);
=20
void translator_loop_temp_check(DisasContextBase *db);
=20
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index b83161a081..587886aa4e 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -46,6 +46,7 @@
=20
#include "exec/cputlb.h"
#include "exec/translate-all.h"
+#include "exec/translator.h"
#include "qemu/bitmap.h"
#include "qemu/qemu-print.h"
#include "qemu/timer.h"
@@ -1392,11 +1393,12 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
TCGProfile *prof =3D &tcg_ctx->prof;
int64_t ti;
#endif
+ void *host_pc;
=20
assert_memory_lock();
qemu_thread_jit_write();
=20
- phys_pc =3D get_page_addr_code(env, pc);
+ phys_pc =3D get_page_addr_code_hostp(env, pc, &host_pc);
=20
if (phys_pc =3D=3D -1) {
/* Generate a one-shot TB with 1 insn in it */
@@ -1444,7 +1446,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
tcg_func_start(tcg_ctx);
=20
tcg_ctx->cpu =3D env_cpu(env);
- gen_intermediate_code(cpu, tb, max_insns);
+ gen_intermediate_code(cpu, tb, max_insns, pc, host_pc);
assert(tb->size !=3D 0);
tcg_ctx->cpu =3D NULL;
max_insns =3D tb->icount;
diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
index fe7af9b943..3eef30d93a 100644
--- a/accel/tcg/translator.c
+++ b/accel/tcg/translator.c
@@ -51,16 +51,17 @@ static inline void translator_page_protect(DisasContext=
Base *dcbase,
#endif
}
=20
-void translator_loop(const TranslatorOps *ops, DisasContextBase *db,
- CPUState *cpu, TranslationBlock *tb, int max_insns)
+void translator_loop(CPUState *cpu, TranslationBlock *tb, int max_insns,
+ target_ulong pc, void *host_pc,
+ const TranslatorOps *ops, DisasContextBase *db)
{
uint32_t cflags =3D tb_cflags(tb);
bool plugin_enabled;
=20
/* Initialize DisasContext */
db->tb =3D tb;
- db->pc_first =3D tb->pc;
- db->pc_next =3D db->pc_first;
+ db->pc_first =3D pc;
+ db->pc_next =3D pc;
db->is_jmp =3D DISAS_NEXT;
db->num_insns =3D 0;
db->max_insns =3D max_insns;
diff --git a/target/alpha/translate.c b/target/alpha/translate.c
index 9af1627079..6766350f56 100644
--- a/target/alpha/translate.c
+++ b/target/alpha/translate.c
@@ -3043,10 +3043,11 @@ static const TranslatorOps alpha_tr_ops =3D {
.disas_log =3D alpha_tr_disas_log,
};
=20
-void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in=
sns)
+void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in=
sns,
+ target_ulong pc, void *host_pc)
{
DisasContext dc;
- translator_loop(&alpha_tr_ops, &dc.base, cpu, tb, max_insns);
+ translator_loop(cpu, tb, max_insns, pc, host_pc, &alpha_tr_ops, &dc.ba=
se);
}
=20
void restore_state_to_opc(CPUAlphaState *env, TranslationBlock *tb,
diff --git a/target/arm/translate.c b/target/arm/translate.c
index ad617b9948..9474e4b44b 100644
--- a/target/arm/translate.c
+++ b/target/arm/translate.c
@@ -9892,7 +9892,8 @@ static const TranslatorOps thumb_translator_ops =3D {
};
=20
/* generate intermediate code for basic block 'tb'. */
-void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in=
sns)
+void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in=
sns,
+ target_ulong pc, void *host_pc)
{
DisasContext dc =3D { };
const TranslatorOps *ops =3D &arm_translator_ops;
@@ -9907,7 +9908,7 @@ void gen_intermediate_code(CPUState *cpu, Translation=
Block *tb, int max_insns)
}
#endif
=20
- translator_loop(ops, &dc.base, cpu, tb, max_insns);
+ translator_loop(cpu, tb, max_insns, pc, host_pc, ops, &dc.base);
}
=20
void restore_state_to_opc(CPUARMState *env, TranslationBlock *tb,
diff --git a/target/avr/translate.c b/target/avr/translate.c
index dc9c3d6bcc..1da34da103 100644
--- a/target/avr/translate.c
+++ b/target/avr/translate.c
@@ -3031,10 +3031,11 @@ static const TranslatorOps avr_tr_ops =3D {
.disas_log =3D avr_tr_disas_log,
};
=20
-void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns)
+void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns,
+ target_ulong pc, void *host_pc)
{
DisasContext dc =3D { };
- translator_loop(&avr_tr_ops, &dc.base, cs, tb, max_insns);
+ translator_loop(cs, tb, max_insns, pc, host_pc, &avr_tr_ops, &dc.base);
}
=20
void restore_state_to_opc(CPUAVRState *env, TranslationBlock *tb,
diff --git a/target/cris/translate.c b/target/cris/translate.c
index ac101344a3..73385b0b3c 100644
--- a/target/cris/translate.c
+++ b/target/cris/translate.c
@@ -3286,10 +3286,11 @@ static const TranslatorOps cris_tr_ops =3D {
.disas_log =3D cris_tr_disas_log,
};
=20
-void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns)
+void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns,
+ target_ulong pc, void *host_pc)
{
DisasContext dc;
- translator_loop(&cris_tr_ops, &dc.base, cs, tb, max_insns);
+ translator_loop(cs, tb, max_insns, pc, host_pc, &cris_tr_ops, &dc.base=
);
}
=20
void cris_cpu_dump_state(CPUState *cs, FILE *f, int flags)
diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c
index d4fc92f7e9..0e8a0772f7 100644
--- a/target/hexagon/translate.c
+++ b/target/hexagon/translate.c
@@ -850,11 +850,13 @@ static const TranslatorOps hexagon_tr_ops =3D {
.disas_log =3D hexagon_tr_disas_log,
};
=20
-void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns)
+void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns,
+ target_ulong pc, void *host_pc)
{
DisasContext ctx;
=20
- translator_loop(&hexagon_tr_ops, &ctx.base, cs, tb, max_insns);
+ translator_loop(cs, tb, max_insns, pc, host_pc,
+ &hexagon_tr_ops, &ctx.base);
}
=20
#define NAME_LEN 64
diff --git a/target/hppa/translate.c b/target/hppa/translate.c
index b8dbfee5e9..8b861957e0 100644
--- a/target/hppa/translate.c
+++ b/target/hppa/translate.c
@@ -4340,10 +4340,11 @@ static const TranslatorOps hppa_tr_ops =3D {
.disas_log =3D hppa_tr_disas_log,
};
=20
-void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns)
+void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns,
+ target_ulong pc, void *host_pc)
{
DisasContext ctx;
- translator_loop(&hppa_tr_ops, &ctx.base, cs, tb, max_insns);
+ translator_loop(cs, tb, max_insns, pc, host_pc, &hppa_tr_ops, &ctx.bas=
e);
}
=20
void restore_state_to_opc(CPUHPPAState *env, TranslationBlock *tb,
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
index a23417d058..4836c889e0 100644
--- a/target/i386/tcg/translate.c
+++ b/target/i386/tcg/translate.c
@@ -8708,11 +8708,12 @@ static const TranslatorOps i386_tr_ops =3D {
};
=20
/* generate intermediate code for basic block 'tb'. */
-void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in=
sns)
+void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in=
sns,
+ target_ulong pc, void *host_pc)
{
DisasContext dc;
=20
- translator_loop(&i386_tr_ops, &dc.base, cpu, tb, max_insns);
+ translator_loop(cpu, tb, max_insns, pc, host_pc, &i386_tr_ops, &dc.bas=
e);
}
=20
void restore_state_to_opc(CPUX86State *env, TranslationBlock *tb,
diff --git a/target/loongarch/translate.c b/target/loongarch/translate.c
index 51ba291430..95b37ea180 100644
--- a/target/loongarch/translate.c
+++ b/target/loongarch/translate.c
@@ -241,11 +241,13 @@ static const TranslatorOps loongarch_tr_ops =3D {
.disas_log =3D loongarch_tr_disas_log,
};
=20
-void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns)
+void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns,
+ target_ulong pc, void *host_pc)
{
DisasContext ctx;
=20
- translator_loop(&loongarch_tr_ops, &ctx.base, cs, tb, max_insns);
+ translator_loop(cs, tb, max_insns, pc, host_pc,
+ &loongarch_tr_ops, &ctx.base);
}
=20
void loongarch_translate_init(void)
diff --git a/target/m68k/translate.c b/target/m68k/translate.c
index 8f3c298ad0..5098f7e570 100644
--- a/target/m68k/translate.c
+++ b/target/m68k/translate.c
@@ -6361,10 +6361,11 @@ static const TranslatorOps m68k_tr_ops =3D {
.disas_log =3D m68k_tr_disas_log,
};
=20
-void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in=
sns)
+void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in=
sns,
+ target_ulong pc, void *host_pc)
{
DisasContext dc;
- translator_loop(&m68k_tr_ops, &dc.base, cpu, tb, max_insns);
+ translator_loop(cpu, tb, max_insns, pc, host_pc, &m68k_tr_ops, &dc.bas=
e);
}
=20
static double floatx80_to_double(CPUM68KState *env, uint16_t high, uint64_=
t low)
diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c
index bf01384d33..c5546f93aa 100644
--- a/target/microblaze/translate.c
+++ b/target/microblaze/translate.c
@@ -1849,10 +1849,11 @@ static const TranslatorOps mb_tr_ops =3D {
.disas_log =3D mb_tr_disas_log,
};
=20
-void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in=
sns)
+void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in=
sns,
+ target_ulong pc, void *host_pc)
{
DisasContext dc;
- translator_loop(&mb_tr_ops, &dc.base, cpu, tb, max_insns);
+ translator_loop(cpu, tb, max_insns, pc, host_pc, &mb_tr_ops, &dc.base);
}
=20
void mb_cpu_dump_state(CPUState *cs, FILE *f, int flags)
diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c
index de1511baaf..0d936e2648 100644
--- a/target/mips/tcg/translate.c
+++ b/target/mips/tcg/translate.c
@@ -16155,11 +16155,12 @@ static const TranslatorOps mips_tr_ops =3D {
.disas_log =3D mips_tr_disas_log,
};
=20
-void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns)
+void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns,
+ target_ulong pc, void *host_pc)
{
DisasContext ctx;
=20
- translator_loop(&mips_tr_ops, &ctx.base, cs, tb, max_insns);
+ translator_loop(cs, tb, max_insns, pc, host_pc, &mips_tr_ops, &ctx.bas=
e);
}
=20
void mips_tcg_init(void)
diff --git a/target/nios2/translate.c b/target/nios2/translate.c
index 3a037a68cc..c588e8e885 100644
--- a/target/nios2/translate.c
+++ b/target/nios2/translate.c
@@ -1038,10 +1038,11 @@ static const TranslatorOps nios2_tr_ops =3D {
.disas_log =3D nios2_tr_disas_log,
};
=20
-void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns)
+void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns,
+ target_ulong pc, void *host_pc)
{
DisasContext dc;
- translator_loop(&nios2_tr_ops, &dc.base, cs, tb, max_insns);
+ translator_loop(cs, tb, max_insns, pc, host_pc, &nios2_tr_ops, &dc.bas=
e);
}
=20
void nios2_cpu_dump_state(CPUState *cs, FILE *f, int flags)
diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c
index 7b8ad43d5f..8154f9d744 100644
--- a/target/openrisc/translate.c
+++ b/target/openrisc/translate.c
@@ -1705,11 +1705,13 @@ static const TranslatorOps openrisc_tr_ops =3D {
.disas_log =3D openrisc_tr_disas_log,
};
=20
-void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns)
+void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns,
+ target_ulong pc, void *host_pc)
{
DisasContext ctx;
=20
- translator_loop(&openrisc_tr_ops, &ctx.base, cs, tb, max_insns);
+ translator_loop(cs, tb, max_insns, pc, host_pc,
+ &openrisc_tr_ops, &ctx.base);
}
=20
void openrisc_cpu_dump_state(CPUState *cs, FILE *f, int flags)
diff --git a/target/ppc/translate.c b/target/ppc/translate.c
index 388337f81b..000b1e518d 100644
--- a/target/ppc/translate.c
+++ b/target/ppc/translate.c
@@ -7719,11 +7719,12 @@ static const TranslatorOps ppc_tr_ops =3D {
.disas_log =3D ppc_tr_disas_log,
};
=20
-void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns)
+void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns,
+ target_ulong pc, void *host_pc)
{
DisasContext ctx;
=20
- translator_loop(&ppc_tr_ops, &ctx.base, cs, tb, max_insns);
+ translator_loop(cs, tb, max_insns, pc, host_pc, &ppc_tr_ops, &ctx.base=
);
}
=20
void restore_state_to_opc(CPUPPCState *env, TranslationBlock *tb,
diff --git a/target/riscv/translate.c b/target/riscv/translate.c
index 63b04e8a94..38666ddc91 100644
--- a/target/riscv/translate.c
+++ b/target/riscv/translate.c
@@ -1196,11 +1196,12 @@ static const TranslatorOps riscv_tr_ops =3D {
.disas_log =3D riscv_tr_disas_log,
};
=20
-void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns)
+void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns,
+ target_ulong pc, void *host_pc)
{
DisasContext ctx;
=20
- translator_loop(&riscv_tr_ops, &ctx.base, cs, tb, max_insns);
+ translator_loop(cs, tb, max_insns, pc, host_pc, &riscv_tr_ops, &ctx.ba=
se);
}
=20
void riscv_translate_init(void)
diff --git a/target/rx/translate.c b/target/rx/translate.c
index 62aee66937..ea5653bc95 100644
--- a/target/rx/translate.c
+++ b/target/rx/translate.c
@@ -2363,11 +2363,12 @@ static const TranslatorOps rx_tr_ops =3D {
.disas_log =3D rx_tr_disas_log,
};
=20
-void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns)
+void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns,
+ target_ulong pc, void *host_pc)
{
DisasContext dc;
=20
- translator_loop(&rx_tr_ops, &dc.base, cs, tb, max_insns);
+ translator_loop(cs, tb, max_insns, pc, host_pc, &rx_tr_ops, &dc.base);
}
=20
void restore_state_to_opc(CPURXState *env, TranslationBlock *tb,
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index e2ee005671..d4c0b9b3a2 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -6676,11 +6676,12 @@ static const TranslatorOps s390x_tr_ops =3D {
.disas_log =3D s390x_tr_disas_log,
};
=20
-void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns)
+void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns,
+ target_ulong pc, void *host_pc)
{
DisasContext dc;
=20
- translator_loop(&s390x_tr_ops, &dc.base, cs, tb, max_insns);
+ translator_loop(cs, tb, max_insns, pc, host_pc, &s390x_tr_ops, &dc.bas=
e);
}
=20
void restore_state_to_opc(CPUS390XState *env, TranslationBlock *tb,
diff --git a/target/sh4/translate.c b/target/sh4/translate.c
index f1b190e7cf..01056571c3 100644
--- a/target/sh4/translate.c
+++ b/target/sh4/translate.c
@@ -2368,11 +2368,12 @@ static const TranslatorOps sh4_tr_ops =3D {
.disas_log =3D sh4_tr_disas_log,
};
=20
-void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns)
+void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns,
+ target_ulong pc, void *host_pc)
{
DisasContext ctx;
=20
- translator_loop(&sh4_tr_ops, &ctx.base, cs, tb, max_insns);
+ translator_loop(cs, tb, max_insns, pc, host_pc, &sh4_tr_ops, &ctx.base=
);
}
=20
void restore_state_to_opc(CPUSH4State *env, TranslationBlock *tb,
diff --git a/target/sparc/translate.c b/target/sparc/translate.c
index 2e28222d31..2cbbe2396a 100644
--- a/target/sparc/translate.c
+++ b/target/sparc/translate.c
@@ -5917,11 +5917,12 @@ static const TranslatorOps sparc_tr_ops =3D {
.disas_log =3D sparc_tr_disas_log,
};
=20
-void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns)
+void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns,
+ target_ulong pc, void *host_pc)
{
DisasContext dc =3D {};
=20
- translator_loop(&sparc_tr_ops, &dc.base, cs, tb, max_insns);
+ translator_loop(cs, tb, max_insns, pc, host_pc, &sparc_tr_ops, &dc.bas=
e);
}
=20
void sparc_tcg_init(void)
diff --git a/target/tricore/translate.c b/target/tricore/translate.c
index d170500fa5..a0558ead71 100644
--- a/target/tricore/translate.c
+++ b/target/tricore/translate.c
@@ -8878,10 +8878,12 @@ static const TranslatorOps tricore_tr_ops =3D {
};
=20
=20
-void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns)
+void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins=
ns,
+ target_ulong pc, void *host_pc)
{
DisasContext ctx;
- translator_loop(&tricore_tr_ops, &ctx.base, cs, tb, max_insns);
+ translator_loop(cs, tb, max_insns, pc, host_pc,
+ &tricore_tr_ops, &ctx.base);
}
=20
void
diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
index 70e11eeb45..8b864ef925 100644
--- a/target/xtensa/translate.c
+++ b/target/xtensa/translate.c
@@ -1279,10 +1279,12 @@ static const TranslatorOps xtensa_translator_ops =
=3D {
.disas_log =3D xtensa_tr_disas_log,
};
=20
-void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in=
sns)
+void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in=
sns,
+ target_ulong pc, void *host_pc)
{
DisasContext dc =3D {};
- translator_loop(&xtensa_translator_ops, &dc.base, cpu, tb, max_insns);
+ translator_loop(cpu, tb, max_insns, pc, host_pc,
+ &xtensa_translator_ops, &dc.base);
}
=20
void xtensa_cpu_dump_state(CPUState *cs, FILE *f, int flags)
--=20
2.34.1