SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

accel/tcg: Pass DisasContextBase to translator_fake_ldb

Browse Source 
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-04-02 15:27:14 -10:00
parent 66f3b79e85
commit 99977aefd0
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accel/tcg/translator.c
View File

@ -375,7 +375,7 @@ uint64_t translator_ldq(CPUArchState *env, DisasContextBase *db, vaddr pc)
return ret; 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)); plugin_insn_append(pc, &insn8, sizeof(insn8));
} }

5
include/exec/translator.h
View File

@ -222,15 +222,16 @@ translator_ldq_swap(CPUArchState *env, DisasContextBase *db,
/** /**
* translator_fake_ldb - fake instruction load * translator_fake_ldb - fake instruction load
* @insn8: byte of instruction * @db: Disassembly context
* @pc: program counter of instruction * @pc: program counter of instruction
* @insn8: byte of instruction
* *
* This is a special case helper used where the instruction we are * This is a special case helper used where the instruction we are
* about to translate comes from somewhere else (e.g. being * about to translate comes from somewhere else (e.g. being
* re-synthesised for s390x "ex"). It ensures we update other areas of * re-synthesised for s390x "ex"). It ensures we update other areas of
* the translator with details of the executed instruction. * 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 COMPILING_PER_TARGET #ifdef COMPILING_PER_TARGET
/* /*

2
target/s390x/tcg/translate.c
View File

@ -6203,7 +6203,7 @@ static const DisasInsn *extract_insn(CPUS390XState *env, DisasContext *s)
/* Register insn bytes with translator so plugins work. */ /* Register insn bytes with translator so plugins work. */
for (int i = 0; i < ilen; i++) { for (int i = 0; i < ilen; i++) {
uint8_t byte = extract64(insn, 56 - (i * 8), 8); 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; op = insn >> 56;
} else { } else {