motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2026-02-21 11:52:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/i386/hvf: remove HVF specific calls from x86_decode.c

Browse source 
Use the newly defined emul_ops. This allows the module to be reused
by other accelerator in the future.

No functional change intended.

Signed-off-by: Wei Liu <liuwe@linux.microsoft.com>
Link: https://lore.kernel.org/r/1741377325-28175-3-git-send-email-liuwe@linux.microsoft.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Wei Liu 2025-03-07 11:55:13 -08:00 • committed by Paolo Bonzini
parent 26a44d9d2d
commit 0860abbe84
1 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
target/i386/hvf/x86_decode.c
View file

@ -21,6 +21,7 @@
#include "panic.h"
#include "x86_decode.h"
#include "vmx.h"
#include "x86_emu.h"
#include "x86_mmu.h"
#include "x86_descr.h"
@ -74,7 +75,7 @@ static inline uint64_t decode_bytes(CPUX86State *env, struct x86_decode *decode,
break;
}
target_ulong va = linear_rip(env_cpu(env), env->eip) + decode->len;
vmx_read_mem(env_cpu(env), &val, va, size);
emul_ops->read_mem(env_cpu(env), &val, va, size);
decode->len += size;
return val;
@ -1893,16 +1894,6 @@ static void decode_prefix(CPUX86State *env, struct x86_decode *decode)
}
}
static struct x86_segment_descriptor get_cs_descriptor(CPUState *s)
{
struct vmx_segment vmx_cs;
x86_segment_descriptor cs;
vmx_read_segment_descriptor(s, &vmx_cs, R_CS);
vmx_segment_to_x86_descriptor(s, &vmx_cs, &cs);
return cs;
}
void set_addressing_size(CPUX86State *env, struct x86_decode *decode)
{
decode->addressing_size = -1;
@ -1914,7 +1905,8 @@ void set_addressing_size(CPUX86State *env, struct x86_decode *decode)
}
} else if (!x86_is_long_mode(env_cpu(env))) {
/* protected */
x86_segment_descriptor cs = get_cs_descriptor(env_cpu(env));
x86_segment_descriptor cs;
emul_ops->read_segment_descriptor(env_cpu(env), &cs, R_CS);
/* check db */
if (cs.db) {
if (decode->addr_size_override) {
@ -1950,7 +1942,8 @@ void set_operand_size(CPUX86State *env, struct x86_decode *decode)
}
} else if (!x86_is_long_mode(env_cpu(env))) {
/* protected */
x86_segment_descriptor cs = get_cs_descriptor(env_cpu(env));
x86_segment_descriptor cs;
emul_ops->read_segment_descriptor(env_cpu(env), &cs, R_CS);
/* check db */
if (cs.db) {
if (decode->op_size_override) {