1. Patchew
  2. QEMU
  3. View series

[PATCH v3] target/i386/emulate: remove rflags leftovers

Magnus Kulke posted 1 patch 6 months, 2 weeks ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20250429093319.5010-1-magnuskulke@linux.microsoft.com
Maintainers: Cameron Esfahani <dirty@apple.com>, Roman Bolshakov <rbolshakov@ddn.com>, Phil Dennis-Jordan <phil@philjordan.eu>, Wei Liu <wei.liu@kernel.org>
target/i386/emulate/x86_decode.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
[PATCH v3] target/i386/emulate: remove rflags leftovers
Posted by Magnus Kulke 6 months, 2 weeks ago 
Fixes: c901905ea670 ("target/i386/emulate: remove flags_mask")

In c901905ea670 rflags have been removed from `x86_decode`, but there
were some leftovers.

Signed-off-by: Magnus Kulke <magnuskulke@linux.microsoft.com>
---
 target/i386/emulate/x86_decode.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/target/i386/emulate/x86_decode.c b/target/i386/emulate/x86_decode.c
index 7fee219687..7efa2f570e 100644
--- a/target/i386/emulate/x86_decode.c
+++ b/target/i386/emulate/x86_decode.c
@@ -1408,7 +1408,7 @@ struct decode_tbl _2op_inst[] = {
 };
 
 struct decode_x87_tbl invl_inst_x87 = {0x0, 0, 0, 0, 0, false, false, NULL,
-                                       NULL, decode_invalid, 0};
+                                       NULL, decode_invalid};
 
 struct decode_x87_tbl _x87_inst[] = {
     {0xd8, 0, 3, X86_DECODE_CMD_FADD, 10, false, false,
@@ -1456,8 +1456,7 @@ struct decode_x87_tbl _x87_inst[] = {
      decode_x87_modrm_st0, NULL, decode_d9_4},
     {0xd9, 4, 0, X86_DECODE_CMD_INVL, 4, false, false,
      decode_x87_modrm_bytep, NULL, NULL},
-    {0xd9, 5, 3, X86_DECODE_CMD_FLDxx, 10, false, false, NULL, NULL, NULL,
-     RFLAGS_MASK_NONE},
+    {0xd9, 5, 3, X86_DECODE_CMD_FLDxx, 10, false, false, NULL, NULL, NULL},
     {0xd9, 5, 0, X86_DECODE_CMD_FLDCW, 2, false, false,
      decode_x87_modrm_bytep, NULL, NULL},
 
@@ -1478,20 +1477,17 @@ struct decode_x87_tbl _x87_inst[] = {
      decode_x87_modrm_st0, NULL},
     {0xda, 3, 3, X86_DECODE_CMD_FCMOV, 10, false, false, decode_x87_modrm_st0,
      decode_x87_modrm_st0, NULL},
-    {0xda, 4, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL,
-     RFLAGS_MASK_NONE},
+    {0xda, 4, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL},
     {0xda, 4, 0, X86_DECODE_CMD_FSUB, 4, false, false, decode_x87_modrm_st0,
      decode_x87_modrm_intp, NULL},
     {0xda, 5, 3, X86_DECODE_CMD_FUCOM, 10, false, true, decode_x87_modrm_st0,
      decode_decode_x87_modrm_st0, NULL},
     {0xda, 5, 0, X86_DECODE_CMD_FSUB, 4, true, false, decode_x87_modrm_st0,
      decode_x87_modrm_intp, NULL},
-    {0xda, 6, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL,
-     RFLAGS_MASK_NONE},
+    {0xda, 6, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL},
     {0xda, 6, 0, X86_DECODE_CMD_FDIV, 4, false, false, decode_x87_modrm_st0,
      decode_x87_modrm_intp, NULL},
-    {0xda, 7, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL,
-     RFLAGS_MASK_NONE},
+    {0xda, 7, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL},
     {0xda, 7, 0, X86_DECODE_CMD_FDIV, 4, true, false, decode_x87_modrm_st0,
      decode_x87_modrm_intp, NULL},
 
@@ -1511,8 +1507,7 @@ struct decode_x87_tbl _x87_inst[] = {
      decode_x87_modrm_intp, NULL, NULL},
     {0xdb, 4, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
      decode_db_4},
-    {0xdb, 4, 0, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL,
-     RFLAGS_MASK_NONE},
+    {0xdb, 4, 0, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL},
     {0xdb, 5, 3, X86_DECODE_CMD_FUCOMI, 10, false, false,
      decode_x87_modrm_st0, decode_x87_modrm_st0, NULL},
     {0xdb, 5, 0, X86_DECODE_CMD_FLD, 10, false, false,
-- 
2.34.1
Re: [PATCH v3] target/i386/emulate: remove rflags leftovers
Posted by Paolo Bonzini 6 months, 2 weeks ago 
Il mar 29 apr 2025, 11:33 Magnus Kulke <magnuskulke@linux.microsoft.com> ha
scritto:

> Fixes: c901905ea670 ("target/i386/emulate: remove flags_mask")
>
> In c901905ea670 rflags have been removed from `x86_decode`, but there
> were some leftovers.
>
> Signed-off-by: Magnus Kulke <magnuskulke@linux.microsoft.com>
>

Thanks, I will queue thos; I have some more emulator patches but no way to
test that, could you please help?

Paolo

---
>  target/i386/emulate/x86_decode.c | 17 ++++++-----------
>  1 file changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/target/i386/emulate/x86_decode.c
> b/target/i386/emulate/x86_decode.c
> index 7fee219687..7efa2f570e 100644
> --- a/target/i386/emulate/x86_decode.c
> +++ b/target/i386/emulate/x86_decode.c
> @@ -1408,7 +1408,7 @@ struct decode_tbl _2op_inst[] = {
>  };
>
>  struct decode_x87_tbl invl_inst_x87 = {0x0, 0, 0, 0, 0, false, false,
> NULL,
> -                                       NULL, decode_invalid, 0};
> +                                       NULL, decode_invalid};
>
>  struct decode_x87_tbl _x87_inst[] = {
>      {0xd8, 0, 3, X86_DECODE_CMD_FADD, 10, false, false,
> @@ -1456,8 +1456,7 @@ struct decode_x87_tbl _x87_inst[] = {
>       decode_x87_modrm_st0, NULL, decode_d9_4},
>      {0xd9, 4, 0, X86_DECODE_CMD_INVL, 4, false, false,
>       decode_x87_modrm_bytep, NULL, NULL},
> -    {0xd9, 5, 3, X86_DECODE_CMD_FLDxx, 10, false, false, NULL, NULL, NULL,
> -     RFLAGS_MASK_NONE},
> +    {0xd9, 5, 3, X86_DECODE_CMD_FLDxx, 10, false, false, NULL, NULL,
> NULL},
>      {0xd9, 5, 0, X86_DECODE_CMD_FLDCW, 2, false, false,
>       decode_x87_modrm_bytep, NULL, NULL},
>
> @@ -1478,20 +1477,17 @@ struct decode_x87_tbl _x87_inst[] = {
>       decode_x87_modrm_st0, NULL},
>      {0xda, 3, 3, X86_DECODE_CMD_FCMOV, 10, false, false,
> decode_x87_modrm_st0,
>       decode_x87_modrm_st0, NULL},
> -    {0xda, 4, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL,
> -     RFLAGS_MASK_NONE},
> +    {0xda, 4, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL},
>      {0xda, 4, 0, X86_DECODE_CMD_FSUB, 4, false, false,
> decode_x87_modrm_st0,
>       decode_x87_modrm_intp, NULL},
>      {0xda, 5, 3, X86_DECODE_CMD_FUCOM, 10, false, true,
> decode_x87_modrm_st0,
>       decode_decode_x87_modrm_st0, NULL},
>      {0xda, 5, 0, X86_DECODE_CMD_FSUB, 4, true, false,
> decode_x87_modrm_st0,
>       decode_x87_modrm_intp, NULL},
> -    {0xda, 6, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL,
> -     RFLAGS_MASK_NONE},
> +    {0xda, 6, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL},
>      {0xda, 6, 0, X86_DECODE_CMD_FDIV, 4, false, false,
> decode_x87_modrm_st0,
>       decode_x87_modrm_intp, NULL},
> -    {0xda, 7, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL,
> -     RFLAGS_MASK_NONE},
> +    {0xda, 7, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL},
>      {0xda, 7, 0, X86_DECODE_CMD_FDIV, 4, true, false,
> decode_x87_modrm_st0,
>       decode_x87_modrm_intp, NULL},
>
> @@ -1511,8 +1507,7 @@ struct decode_x87_tbl _x87_inst[] = {
>       decode_x87_modrm_intp, NULL, NULL},
>      {0xdb, 4, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
>       decode_db_4},
> -    {0xdb, 4, 0, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL,
> -     RFLAGS_MASK_NONE},
> +    {0xdb, 4, 0, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL},
>      {0xdb, 5, 3, X86_DECODE_CMD_FUCOMI, 10, false, false,
>       decode_x87_modrm_st0, decode_x87_modrm_st0, NULL},
>      {0xdb, 5, 0, X86_DECODE_CMD_FLD, 10, false, false,
> --
> 2.34.1
>
>
Re: [PATCH v3] target/i386/emulate: remove rflags leftovers
Posted by Magnus Kulke 6 months, 2 weeks ago 
On Tue, Apr 29, 2025 at 12:02:48PM +0200, Paolo Bonzini wrote:
> Il mar 29 apr 2025, 11:33 Magnus Kulke <magnuskulke@linux.microsoft.com> ha
> scritto:
> 
> > Fixes: c901905ea670 ("target/i386/emulate: remove flags_mask")
> >
> > In c901905ea670 rflags have been removed from `x86_decode`, but there
> > were some leftovers.
> >
> > Signed-off-by: Magnus Kulke <magnuskulke@linux.microsoft.com>
> >
> 
> Thanks, I will queue thos; I have some more emulator patches but no way to
> test that, could you please help?
> 
> Paolo
> 

Yes, I'm using the generalized emulator in the context of adding the MSHV
accelerator. (I'll probably get around sending an RFC patchset this week for
it). There were minor compilation issues w/ the emulator code, that I had to
fix to make it compile on Linux. However I don't have access to an x86_64
Mac for development either, so I can't test a HVF build.

Best,

Magnus

> ---
> >  target/i386/emulate/x86_decode.c | 17 ++++++-----------
> >  1 file changed, 6 insertions(+), 11 deletions(-)
> >
> > diff --git a/target/i386/emulate/x86_decode.c
> > b/target/i386/emulate/x86_decode.c
> > index 7fee219687..7efa2f570e 100644
> > --- a/target/i386/emulate/x86_decode.c
> > +++ b/target/i386/emulate/x86_decode.c
> > @@ -1408,7 +1408,7 @@ struct decode_tbl _2op_inst[] = {
> >  };
> >
> >  struct decode_x87_tbl invl_inst_x87 = {0x0, 0, 0, 0, 0, false, false,
> > NULL,
> > -                                       NULL, decode_invalid, 0};
> > +                                       NULL, decode_invalid};
> >
> >  struct decode_x87_tbl _x87_inst[] = {
> >      {0xd8, 0, 3, X86_DECODE_CMD_FADD, 10, false, false,
> > @@ -1456,8 +1456,7 @@ struct decode_x87_tbl _x87_inst[] = {
> >       decode_x87_modrm_st0, NULL, decode_d9_4},
> >      {0xd9, 4, 0, X86_DECODE_CMD_INVL, 4, false, false,
> >       decode_x87_modrm_bytep, NULL, NULL},
> > -    {0xd9, 5, 3, X86_DECODE_CMD_FLDxx, 10, false, false, NULL, NULL, NULL,
> > -     RFLAGS_MASK_NONE},
> > +    {0xd9, 5, 3, X86_DECODE_CMD_FLDxx, 10, false, false, NULL, NULL,
> > NULL},
> >      {0xd9, 5, 0, X86_DECODE_CMD_FLDCW, 2, false, false,
> >       decode_x87_modrm_bytep, NULL, NULL},
> >
> > @@ -1478,20 +1477,17 @@ struct decode_x87_tbl _x87_inst[] = {
> >       decode_x87_modrm_st0, NULL},
> >      {0xda, 3, 3, X86_DECODE_CMD_FCMOV, 10, false, false,
> > decode_x87_modrm_st0,
> >       decode_x87_modrm_st0, NULL},
> > -    {0xda, 4, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL,
> > -     RFLAGS_MASK_NONE},
> > +    {0xda, 4, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL},
> >      {0xda, 4, 0, X86_DECODE_CMD_FSUB, 4, false, false,
> > decode_x87_modrm_st0,
> >       decode_x87_modrm_intp, NULL},
> >      {0xda, 5, 3, X86_DECODE_CMD_FUCOM, 10, false, true,
> > decode_x87_modrm_st0,
> >       decode_decode_x87_modrm_st0, NULL},
> >      {0xda, 5, 0, X86_DECODE_CMD_FSUB, 4, true, false,
> > decode_x87_modrm_st0,
> >       decode_x87_modrm_intp, NULL},
> > -    {0xda, 6, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL,
> > -     RFLAGS_MASK_NONE},
> > +    {0xda, 6, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL},
> >      {0xda, 6, 0, X86_DECODE_CMD_FDIV, 4, false, false,
> > decode_x87_modrm_st0,
> >       decode_x87_modrm_intp, NULL},
> > -    {0xda, 7, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL,
> > -     RFLAGS_MASK_NONE},
> > +    {0xda, 7, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL},
> >      {0xda, 7, 0, X86_DECODE_CMD_FDIV, 4, true, false,
> > decode_x87_modrm_st0,
> >       decode_x87_modrm_intp, NULL},
> >
> > @@ -1511,8 +1507,7 @@ struct decode_x87_tbl _x87_inst[] = {
> >       decode_x87_modrm_intp, NULL, NULL},
> >      {0xdb, 4, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
> >       decode_db_4},
> > -    {0xdb, 4, 0, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL,
> > -     RFLAGS_MASK_NONE},
> > +    {0xdb, 4, 0, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL, NULL},
> >      {0xdb, 5, 3, X86_DECODE_CMD_FUCOMI, 10, false, false,
> >       decode_x87_modrm_st0, decode_x87_modrm_st0, NULL},
> >      {0xdb, 5, 0, X86_DECODE_CMD_FLD, 10, false, false,
> > --
> > 2.34.1
> >
> >
Re: [PATCH v3] target/i386/emulate: remove rflags leftovers
Posted by Wei Liu 6 months, 2 weeks ago 
On Tue, Apr 29, 2025 at 02:17:01PM +0200, Magnus Kulke wrote:
> On Tue, Apr 29, 2025 at 12:02:48PM +0200, Paolo Bonzini wrote:
> > Il mar 29 apr 2025, 11:33 Magnus Kulke <magnuskulke@linux.microsoft.com> ha
> > scritto:
> > 
> > > Fixes: c901905ea670 ("target/i386/emulate: remove flags_mask")
> > >
> > > In c901905ea670 rflags have been removed from `x86_decode`, but there
> > > were some leftovers.
> > >
> > > Signed-off-by: Magnus Kulke <magnuskulke@linux.microsoft.com>
> > >
> > 
> > Thanks, I will queue thos; I have some more emulator patches but no way to
> > test that, could you please help?
> > 
> > Paolo
> > 
> 
> Yes, I'm using the generalized emulator in the context of adding the MSHV
> accelerator. (I'll probably get around sending an RFC patchset this week for
> it). There were minor compilation issues w/ the emulator code, that I had to
> fix to make it compile on Linux. However I don't have access to an x86_64
> Mac for development either, so I can't test a HVF build.
> 

I still have my loaner Macbook for a few more days. If I have not
returned it when Paolo posts his patches I can build test HVF.

Thanks,
Wei.
Re: [PATCH v3] target/i386/emulate: remove rflags leftovers
Posted by Paolo Bonzini 6 months, 2 weeks ago 
On Fri, May 2, 2025 at 7:04 PM Wei Liu <wei.liu@kernel.org> wrote:
> I still have my loaner Macbook for a few more days. If I have not
> returned it when Paolo posts his patches I can build test HVF.

I have posted them now
(https://lore.kernel.org/qemu-devel/20250502214841.242584-1-pbonzini@redhat.com/).
They apply on top of tags/for-upstream from
https://gitlab.com/bonzini/qemu.git, which includes the other pending
bugfixes and has already passed CI.

Paolo
Re: [PATCH v3] target/i386/emulate: remove rflags leftovers
Posted by Paolo Bonzini 6 months, 2 weeks ago 
Il mar 29 apr 2025, 14:17 Magnus Kulke <magnuskulke@linux.microsoft.com> ha
scritto:

> Yes, I'm using the generalized emulator in the context of adding the MSHV
> accelerator. (I'll probably get around sending an RFC patchset this week
> for
> it). There were minor compilation issues w/ the emulator code, that I had
> to
> fix to make it compile on Linux. However I don't have access to an x86_64
> Mac for development either, so I can't test a HVF build.
>

No problem, using MSHV to test if I am breaking anything in the emulator is
enough!

Paolo

Best,
>
> Magnus
>
> > ---
> > >  target/i386/emulate/x86_decode.c | 17 ++++++-----------
> > >  1 file changed, 6 insertions(+), 11 deletions(-)
> > >
> > > diff --git a/target/i386/emulate/x86_decode.c
> > > b/target/i386/emulate/x86_decode.c
> > > index 7fee219687..7efa2f570e 100644
> > > --- a/target/i386/emulate/x86_decode.c
> > > +++ b/target/i386/emulate/x86_decode.c
> > > @@ -1408,7 +1408,7 @@ struct decode_tbl _2op_inst[] = {
> > >  };
> > >
> > >  struct decode_x87_tbl invl_inst_x87 = {0x0, 0, 0, 0, 0, false, false,
> > > NULL,
> > > -                                       NULL, decode_invalid, 0};
> > > +                                       NULL, decode_invalid};
> > >
> > >  struct decode_x87_tbl _x87_inst[] = {
> > >      {0xd8, 0, 3, X86_DECODE_CMD_FADD, 10, false, false,
> > > @@ -1456,8 +1456,7 @@ struct decode_x87_tbl _x87_inst[] = {
> > >       decode_x87_modrm_st0, NULL, decode_d9_4},
> > >      {0xd9, 4, 0, X86_DECODE_CMD_INVL, 4, false, false,
> > >       decode_x87_modrm_bytep, NULL, NULL},
> > > -    {0xd9, 5, 3, X86_DECODE_CMD_FLDxx, 10, false, false, NULL, NULL,
> NULL,
> > > -     RFLAGS_MASK_NONE},
> > > +    {0xd9, 5, 3, X86_DECODE_CMD_FLDxx, 10, false, false, NULL, NULL,
> > > NULL},
> > >      {0xd9, 5, 0, X86_DECODE_CMD_FLDCW, 2, false, false,
> > >       decode_x87_modrm_bytep, NULL, NULL},
> > >
> > > @@ -1478,20 +1477,17 @@ struct decode_x87_tbl _x87_inst[] = {
> > >       decode_x87_modrm_st0, NULL},
> > >      {0xda, 3, 3, X86_DECODE_CMD_FCMOV, 10, false, false,
> > > decode_x87_modrm_st0,
> > >       decode_x87_modrm_st0, NULL},
> > > -    {0xda, 4, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
> NULL,
> > > -     RFLAGS_MASK_NONE},
> > > +    {0xda, 4, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
> NULL},
> > >      {0xda, 4, 0, X86_DECODE_CMD_FSUB, 4, false, false,
> > > decode_x87_modrm_st0,
> > >       decode_x87_modrm_intp, NULL},
> > >      {0xda, 5, 3, X86_DECODE_CMD_FUCOM, 10, false, true,
> > > decode_x87_modrm_st0,
> > >       decode_decode_x87_modrm_st0, NULL},
> > >      {0xda, 5, 0, X86_DECODE_CMD_FSUB, 4, true, false,
> > > decode_x87_modrm_st0,
> > >       decode_x87_modrm_intp, NULL},
> > > -    {0xda, 6, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
> NULL,
> > > -     RFLAGS_MASK_NONE},
> > > +    {0xda, 6, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
> NULL},
> > >      {0xda, 6, 0, X86_DECODE_CMD_FDIV, 4, false, false,
> > > decode_x87_modrm_st0,
> > >       decode_x87_modrm_intp, NULL},
> > > -    {0xda, 7, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
> NULL,
> > > -     RFLAGS_MASK_NONE},
> > > +    {0xda, 7, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
> NULL},
> > >      {0xda, 7, 0, X86_DECODE_CMD_FDIV, 4, true, false,
> > > decode_x87_modrm_st0,
> > >       decode_x87_modrm_intp, NULL},
> > >
> > > @@ -1511,8 +1507,7 @@ struct decode_x87_tbl _x87_inst[] = {
> > >       decode_x87_modrm_intp, NULL, NULL},
> > >      {0xdb, 4, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
> > >       decode_db_4},
> > > -    {0xdb, 4, 0, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
> NULL,
> > > -     RFLAGS_MASK_NONE},
> > > +    {0xdb, 4, 0, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
> NULL},
> > >      {0xdb, 5, 3, X86_DECODE_CMD_FUCOMI, 10, false, false,
> > >       decode_x87_modrm_st0, decode_x87_modrm_st0, NULL},
> > >      {0xdb, 5, 0, X86_DECODE_CMD_FLD, 10, false, false,
> > > --
> > > 2.34.1
> > >
> > >
>
>
Re: [PATCH v3] target/i386/emulate: remove rflags leftovers
Posted by Magnus Kulke 6 months, 2 weeks ago 
On Tue, Apr 29, 2025 at 02:27:21PM +0200, Paolo Bonzini wrote:
> Il mar 29 apr 2025, 14:17 Magnus Kulke <magnuskulke@linux.microsoft.com> ha
> scritto:
> 
> > Yes, I'm using the generalized emulator in the context of adding the MSHV
> > accelerator. (I'll probably get around sending an RFC patchset this week
> > for
> > it). There were minor compilation issues w/ the emulator code, that I had
> > to
> > fix to make it compile on Linux. However I don't have access to an x86_64
> > Mac for development either, so I can't test a HVF build.
> >
> 
> No problem, using MSHV to test if I am breaking anything in the emulator is
> enough!
> 
> Paolo
> 

Sure CC me, I'll try to keep up and test the changes.

> Best,
> >
> > Magnus
> >
> > > ---
> > > >  target/i386/emulate/x86_decode.c | 17 ++++++-----------
> > > >  1 file changed, 6 insertions(+), 11 deletions(-)
> > > >
> > > > diff --git a/target/i386/emulate/x86_decode.c
> > > > b/target/i386/emulate/x86_decode.c
> > > > index 7fee219687..7efa2f570e 100644
> > > > --- a/target/i386/emulate/x86_decode.c
> > > > +++ b/target/i386/emulate/x86_decode.c
> > > > @@ -1408,7 +1408,7 @@ struct decode_tbl _2op_inst[] = {
> > > >  };
> > > >
> > > >  struct decode_x87_tbl invl_inst_x87 = {0x0, 0, 0, 0, 0, false, false,
> > > > NULL,
> > > > -                                       NULL, decode_invalid, 0};
> > > > +                                       NULL, decode_invalid};
> > > >
> > > >  struct decode_x87_tbl _x87_inst[] = {
> > > >      {0xd8, 0, 3, X86_DECODE_CMD_FADD, 10, false, false,
> > > > @@ -1456,8 +1456,7 @@ struct decode_x87_tbl _x87_inst[] = {
> > > >       decode_x87_modrm_st0, NULL, decode_d9_4},
> > > >      {0xd9, 4, 0, X86_DECODE_CMD_INVL, 4, false, false,
> > > >       decode_x87_modrm_bytep, NULL, NULL},
> > > > -    {0xd9, 5, 3, X86_DECODE_CMD_FLDxx, 10, false, false, NULL, NULL,
> > NULL,
> > > > -     RFLAGS_MASK_NONE},
> > > > +    {0xd9, 5, 3, X86_DECODE_CMD_FLDxx, 10, false, false, NULL, NULL,
> > > > NULL},
> > > >      {0xd9, 5, 0, X86_DECODE_CMD_FLDCW, 2, false, false,
> > > >       decode_x87_modrm_bytep, NULL, NULL},
> > > >
> > > > @@ -1478,20 +1477,17 @@ struct decode_x87_tbl _x87_inst[] = {
> > > >       decode_x87_modrm_st0, NULL},
> > > >      {0xda, 3, 3, X86_DECODE_CMD_FCMOV, 10, false, false,
> > > > decode_x87_modrm_st0,
> > > >       decode_x87_modrm_st0, NULL},
> > > > -    {0xda, 4, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
> > NULL,
> > > > -     RFLAGS_MASK_NONE},
> > > > +    {0xda, 4, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
> > NULL},
> > > >      {0xda, 4, 0, X86_DECODE_CMD_FSUB, 4, false, false,
> > > > decode_x87_modrm_st0,
> > > >       decode_x87_modrm_intp, NULL},
> > > >      {0xda, 5, 3, X86_DECODE_CMD_FUCOM, 10, false, true,
> > > > decode_x87_modrm_st0,
> > > >       decode_decode_x87_modrm_st0, NULL},
> > > >      {0xda, 5, 0, X86_DECODE_CMD_FSUB, 4, true, false,
> > > > decode_x87_modrm_st0,
> > > >       decode_x87_modrm_intp, NULL},
> > > > -    {0xda, 6, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
> > NULL,
> > > > -     RFLAGS_MASK_NONE},
> > > > +    {0xda, 6, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
> > NULL},
> > > >      {0xda, 6, 0, X86_DECODE_CMD_FDIV, 4, false, false,
> > > > decode_x87_modrm_st0,
> > > >       decode_x87_modrm_intp, NULL},
> > > > -    {0xda, 7, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
> > NULL,
> > > > -     RFLAGS_MASK_NONE},
> > > > +    {0xda, 7, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
> > NULL},
> > > >      {0xda, 7, 0, X86_DECODE_CMD_FDIV, 4, true, false,
> > > > decode_x87_modrm_st0,
> > > >       decode_x87_modrm_intp, NULL},
> > > >
> > > > @@ -1511,8 +1507,7 @@ struct decode_x87_tbl _x87_inst[] = {
> > > >       decode_x87_modrm_intp, NULL, NULL},
> > > >      {0xdb, 4, 3, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
> > > >       decode_db_4},
> > > > -    {0xdb, 4, 0, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
> > NULL,
> > > > -     RFLAGS_MASK_NONE},
> > > > +    {0xdb, 4, 0, X86_DECODE_CMD_INVL, 10, false, false, NULL, NULL,
> > NULL},
> > > >      {0xdb, 5, 3, X86_DECODE_CMD_FUCOMI, 10, false, false,
> > > >       decode_x87_modrm_st0, decode_x87_modrm_st0, NULL},
> > > >      {0xdb, 5, 0, X86_DECODE_CMD_FLD, 10, false, false,
> > > > --
> > > > 2.34.1
> > > >
> > > >
> >
> >

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.