From 77213bee1dc2f7ea15b232a74bd66d9dd300cf97 Mon Sep 17 00:00:00 2001
From: ptitSeb <sebastien.chev@gmail.com>
Date: Fri, 26 Jan 2024 12:39:53 +0100
Subject: [32BITS] Added 16/17 ocodes ([ARM64_DYNAREC] too)

---
 src/dynarec/arm64/dynarec_arm64_00.c | 20 +++++++++++++++++++-
 src/emu/x64run.c                     | 16 ++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/dynarec/arm64/dynarec_arm64_00.c b/src/dynarec/arm64/dynarec_arm64_00.c
index 697ff0d9..3dc50d3a 100644
--- a/src/dynarec/arm64/dynarec_arm64_00.c
+++ b/src/dynarec/arm64/dynarec_arm64_00.c
@@ -239,7 +239,25 @@ uintptr_t dynarec64_00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin
             MOV64xw(x1, i64);
             emit_adc32(dyn, ninst, rex, xRAX, x1, x3, x4);
             break;
-
+        case 0x16:
+            if(rex.is32bits) {
+                INST_NAME("PUSH SS");
+                LDRH_U12(x1, xEmu, offsetof(x64emu_t, segs[_SS]));
+                PUSH1_32(x1);
+            } else {
+                DEFAULT;
+            }
+            break;
+        case 0x17:
+            if(rex.is32bits) {
+                INST_NAME("POP SS");
+                POP1_32(x1);
+                STRH_U12(x1, xEmu, offsetof(x64emu_t, segs[_SS]));
+                STRw_U12(xZR, xEmu, offsetof(x64emu_t, segs_serial[_SS]));
+            } else {
+                DEFAULT;
+            }
+            break;
         case 0x18:
             INST_NAME("SBB Eb, Gb");
             READFLAGS(X_CF);
diff --git a/src/emu/x64run.c b/src/emu/x64run.c
index 986c371a..82973d33 100644
--- a/src/emu/x64run.c
+++ b/src/emu/x64run.c
@@ -218,6 +218,22 @@ x64emurun:
         GO(0x30, xor)                   /* XOR 0x30 -> 0x35 */
         #undef GO
 
+        case 0x16:                      /* PUSH SS */
+            if(!rex.is32bits) {
+                unimp = 1;
+                goto fini;
+            }
+            Push32(emu, emu->segs[_SS]);  // even if a segment is a 16bits, a 32bits push/pop is done
+            break;
+        case 0x17:                      /* POP SS */
+            if(!rex.is32bits) {
+                unimp = 1;
+                goto fini;
+            }
+            emu->segs[_SS] = Pop32(emu);    // no check, no use....
+            emu->segs_serial[_SS] = 0;
+            break;
+
         case 0x1E:                      /* PUSH DS */
             if(!rex.is32bits) {
                 unimp = 1;
-- 
cgit 1.4.1