about summary refs log tree commit diff stats
path: root/src/dynarec
diff options
context:
space:
mode:
authorptitSeb <sebastien.chev@gmail.com>2024-01-26 15:39:05 +0100
committerptitSeb <sebastien.chev@gmail.com>2024-01-26 15:39:05 +0100
commit1d0d7e9e0901cdd20b6adffabd56eeb2ae2e2737 (patch)
treec9c1bbe8b74f9a8804a3ecaf7a9319b335694f22 /src/dynarec
parentaab6bc086986bd22d513f05175276e5907340f86 (diff)
downloadbox64-1d0d7e9e0901cdd20b6adffabd56eeb2ae2e2737.tar.gz
box64-1d0d7e9e0901cdd20b6adffabd56eeb2ae2e2737.zip
Reworked 0F 01 opcode ([ARM64_DYNAREC] too)
Diffstat (limited to 'src/dynarec')
-rw-r--r--src/dynarec/arm64/dynarec_arm64_0f.c39
1 files changed, 30 insertions, 9 deletions
diff --git a/src/dynarec/arm64/dynarec_arm64_0f.c b/src/dynarec/arm64/dynarec_arm64_0f.c
index 79058758..5b4253ab 100644
--- a/src/dynarec/arm64/dynarec_arm64_0f.c
+++ b/src/dynarec/arm64/dynarec_arm64_0f.c
@@ -65,6 +65,7 @@ uintptr_t dynarec64_0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
         case 0x01:

             // TODO:, /0 is SGDT. While 0F 01 D0 is XGETBV, etc...

             nextop = F8;

+            if(MODREG)

             switch(nextop) {

                 case 0xD0:

                     INST_NAME("FAKE xgetbv");

@@ -78,15 +79,35 @@ uintptr_t dynarec64_0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
                     *ok = 0;

                     break;

                 default:

-                    switch((nextop>>3)&7) {

-                        case 0: // SGDT

-                            INST_NAME("FAKE sgdt Ed");

-                            addr = fakeed(dyn, addr, ninst, nextop);

-                                // do nothing for now...

-                            break;

-                        default:

-                            DEFAULT;

-                    }

+                    DEFAULT;

+            } else

+                switch((nextop>>3)&7) {

+                    case 0: // SGDT

+                        INST_NAME("SGDT Ed");

+                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, NULL, 0, 0, rex, NULL, 0, 0);

+                        MOV32w(x1, 0x7f);

+                        STURH_I9(x1, wback, 0);

+                        MOV32w(x1, 0x000c);

+                        STURH_I9(x1, wback, 2);

+                        MOV32w(x1, 0xd000);

+                        STURH_I9(x1, wback, 4);

+                        break;

+                    case 1:

+                        INST_NAME("SIDT Ed");

+                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, NULL, 0, 0, rex, NULL, 0, 0);

+                        MOV32w(x1, 0xfff);

+                        STURH_I9(x1, wback, 0);

+                        STURw_I9(xZR, wback, 2);

+                        break;

+                    case 4:

+                        INST_NAME("SMSW Ew");

+                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, NULL, 0, 0, rex, NULL, 0, 0);

+                        // dummy for now... Do I need to track CR0 state?

+                        MOV32w(x1, (1<<0) | (1<<4)); // only PE and ET set...

+                        STURH_I9(x1, wback, 0);

+                        break;

+                    default:

+                        DEFAULT;

             }

             break;