Mailing List Archive

[xen master] x86emul: introduce stub_exn field in state structure
commit 5eb6bd7454e253f4907dbeb7aa982967b21698bc
Author: Jan Beulich <jbeulich@suse.com>
AuthorDate: Mon Apr 17 14:05:13 2023 +0200
Commit: Jan Beulich <jbeulich@suse.com>
CommitDate: Mon Apr 17 14:05:13 2023 +0200

x86emul: introduce stub_exn field in state structure

This can be used to reduce the number of parameters x86emul_fpu() needs
to take, and will be re-used subsequently.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
xen/arch/x86/x86_emulate/fpu.c | 3 +--
xen/arch/x86/x86_emulate/private.h | 3 ++-
xen/arch/x86/x86_emulate/x86_emulate.c | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/xen/arch/x86/x86_emulate/fpu.c b/xen/arch/x86/x86_emulate/fpu.c
index baa383f9d1..480d879657 100644
--- a/xen/arch/x86/x86_emulate/fpu.c
+++ b/xen/arch/x86/x86_emulate/fpu.c
@@ -78,9 +78,8 @@ int x86emul_fpu(struct x86_emulate_state *s,
unsigned int *insn_bytes,
enum x86_emulate_fpu_type *fpu_type,
#define fpu_type (*fpu_type) /* for get_fpu() */
- struct stub_exn *stub_exn,
-#define stub_exn (*stub_exn) /* for invoke_stub() */
mmval_t *mmvalp)
+#define stub_exn (*s->stub_exn) /* for invoke_stub() */
{
uint8_t b;
int rc;
diff --git a/xen/arch/x86/x86_emulate/private.h b/xen/arch/x86/x86_emulate/private.h
index 1a7c17feab..0f96eb5fd6 100644
--- a/xen/arch/x86/x86_emulate/private.h
+++ b/xen/arch/x86/x86_emulate/private.h
@@ -310,6 +310,8 @@ struct x86_emulate_state {

unsigned long ip;

+ struct stub_exn *stub_exn;
+
#ifndef NDEBUG
/*
* Track caller of x86_decode_insn() to spot missing as well as
@@ -747,7 +749,6 @@ int x86emul_fpu(struct x86_emulate_state *s,
const struct x86_emulate_ops *ops,
unsigned int *insn_bytes,
enum x86_emulate_fpu_type *fpu_type,
- struct stub_exn *stub_exn,
mmval_t *mmvalp);
int x86emul_0f01(struct x86_emulate_state *s,
struct cpu_user_regs *regs,
diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c
index f316117516..17b374069c 100644
--- a/xen/arch/x86/x86_emulate/x86_emulate.c
+++ b/xen/arch/x86/x86_emulate/x86_emulate.c
@@ -2024,8 +2024,9 @@ x86_emulate(
#ifndef X86EMUL_NO_FPU
case 0x9b: /* wait/fwait */
case 0xd8 ... 0xdf: /* FPU */
+ state->stub_exn = &stub_exn;
rc = x86emul_fpu(state, &_regs, &dst, &src, ctxt, ops,
- &insn_bytes, &fpu_type, &stub_exn, mmvalp);
+ &insn_bytes, &fpu_type, mmvalp);
goto dispatch_from_helper;
#endif

--
generated by git-patchbot for /home/xen/git/xen.git#master