ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

accel/tcg: Introduce translator_fake_ld 

Replace translator_fake_ldb, which required multiple calls,
with translator_fake_ld, which can take all data at once.

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-03 07:29:37 -10:00
parent 4c833c60e0
commit 4c6163eaf2
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
accel/tcg/translator.c
View File

@ -468,9 +468,8 @@ uint64_t translator_ldq(CPUArchState *env, DisasContextBase *db, vaddr pc)
return tgt;
}
void translator_fake_ldb(DisasContextBase *db, vaddr pc, uint8_t insn8)
void translator_fake_ld(DisasContextBase *db, const void *data, size_t len)
{
assert(pc >= db->pc_first);
db->fake_insn = true;
record_save(db, pc, &insn8, sizeof(insn8));
record_save(db, db->pc_first, data, len);
}

8
include/exec/translator.h
View File

@ -234,17 +234,17 @@ translator_ldq_swap(CPUArchState *env, DisasContextBase *db,
}
/**
* translator_fake_ldb - fake instruction load
* translator_fake_ld - fake instruction load
* @db: Disassembly context
* @pc: program counter of instruction
* @insn8: byte of instruction
* @data: bytes of instruction
* @len: number of bytes
*
* 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(DisasContextBase *db, vaddr pc, uint8_t insn8);
void translator_fake_ld(DisasContextBase *db, const void *data, size_t len);
/**
* translator_st

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

@ -6191,6 +6191,8 @@ static const DisasInsn *extract_insn(CPUS390XState *env, DisasContext *s)
const DisasInsn *info;
if (unlikely(s->ex_value)) {
uint64_t be_insn;
/* Drop the EX data now, so that it's clear on exception paths. */
tcg_gen_st_i64(tcg_constant_i64(0), tcg_env,
offsetof(CPUS390XState, ex_value));
@ -6200,10 +6202,8 @@ static const DisasInsn *extract_insn(CPUS390XState *env, DisasContext *s)
ilen = s->ex_value & 0xf;
/* 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(&s->base, pc + i, byte);
}
be_insn = cpu_to_be64(insn);
translator_fake_ld(&s->base, &be_insn, ilen);
op = insn >> 56;
} else {
insn = ld_code2(env, s, pc);