From cb13ca526a82446fa01805c11782959aefad5701 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Fri, 28 Oct 2022 03:27:35 +0200
Subject: [PATCH] Handle trap first also on interpreter - makes retf.exe at
 least run.

---
 src/cpu/386.c | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/cpu/386.c b/src/cpu/386.c
index 48c45d342..30340c226 100644
--- a/src/cpu/386.c
+++ b/src/cpu/386.c
@@ -172,6 +172,17 @@ exec386(int cycs)
             if (cpu_end_block_after_ins)
                 cpu_end_block_after_ins--;
 
+            if (trap) {
+                flags_rebuild();
+		trap = 0;
+#ifndef USE_NEW_DYNAREC
+		oldcs = CS;
+#endif
+		cpu_state.oldpc = cpu_state.pc;
+		dr[6] |= 0x4000;
+		x86_int(1);
+            }
+
             if (cpu_state.abrt) {
                 flags_rebuild();
                 tempi          = cpu_state.abrt & ABRT_MASK;
@@ -198,23 +209,10 @@ exec386(int cycs)
 
             if (smi_line)
                 enter_smm_check(0);
-            else if (trap) {
-                flags_rebuild();
-                dr[6] |= 0x4000;
-                if (msw & 1)
-                    pmodeint(1, 0);
-                else {
-                    writememw(ss, (SP - 2) & 0xFFFF, cpu_state.flags);
-                    writememw(ss, (SP - 4) & 0xFFFF, CS);
-                    writememw(ss, (SP - 6) & 0xFFFF, cpu_state.pc);
-                    SP -= 6;
-                    addr = (1 << 2) + idt.base;
-                    cpu_state.flags &= ~I_FLAG;
-                    cpu_state.flags &= ~T_FLAG;
-                    cpu_state.pc = readmemw(0, addr);
-                    loadcs(readmemw(0, addr + 2));
-                }
-            } else if (nmi && nmi_enable && nmi_mask) {
+            else if (nmi && nmi_enable && nmi_mask) {
+#ifndef USE_NEW_DYNAREC
+		oldcs = CS;
+#endif
                 cpu_state.oldpc = cpu_state.pc;
                 x86_int(2);
                 nmi_enable = 0;