@@ -220,15 +220,16 @@ translator_ldq_swap(CPUArchState *env, DisasContextBase *db,
/**
* translator_fake_ldb - fake instruction load
- * @insn8: byte of instruction
+ * @db: Disassembly context
* @pc: program counter of instruction
+ * @insn8: byte of instruction
*
* This is a special case helper used where the instruction we are
* about to translate comes from somewhere else (e.g. being
* re-synthesised for s390x "ex"). It ensures we update other areas of
* the translator with details of the executed instruction.
*/
-void translator_fake_ldb(uint8_t insn8, vaddr pc);
+void translator_fake_ldb(DisasContextBase *db, vaddr pc, uint8_t insn8);
#ifdef NEED_CPU_H
/*
@@ -371,7 +371,7 @@ uint64_t translator_ldq(CPUArchState *env, DisasContextBase *db, vaddr pc)
return ret;
}
-void translator_fake_ldb(uint8_t insn8, vaddr pc)
+void translator_fake_ldb(DisasContextBase *db, vaddr pc, uint8_t insn8)
{
plugin_insn_append(pc, &insn8, sizeof(insn8));
}
@@ -6204,7 +6204,7 @@ static const DisasInsn *extract_insn(CPUS390XState *env, DisasContext *s)
/* Register insn bytes with translator so plugins work. */
for (int i = 0; i < ilen; i++) {
uint8_t byte = extract64(insn, 56 - (i * 8), 8);
- translator_fake_ldb(byte, pc + i);
+ translator_fake_ldb(&s->base, pc + i, byte);
}
op = insn >> 56;
} else {
Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- include/exec/translator.h | 5 +++-- accel/tcg/translator.c | 2 +- target/s390x/tcg/translate.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-)