Fixed PUSH from Group 4/5 modreg 7

Author: morphx666

GenOpCodes/My Project/AssemblyInfo.vb

@@ -31,7 +31,7 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2024.3.12.1273")>
-<Assembly: AssemblyFileVersion("2024.3.12.1273")>
+<Assembly: AssemblyVersion("2024.3.12.1277")>
+<Assembly: AssemblyFileVersion("2024.3.12.1277")>
 
 <assembly: AssemblyInformationalVersion("2024.3.12")>

RunTests/My Project/AssemblyInfo.vb

@@ -31,7 +31,7 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2024.3.12.1679")>
-<Assembly: AssemblyFileVersion("2024.3.12.1679")>
+<Assembly: AssemblyVersion("2024.3.12.1683")>
+<Assembly: AssemblyFileVersion("2024.3.12.1683")>
 
 <assembly: AssemblyInformationalVersion("2024.3.12")>

RunTests2/Program.cs

@@ -25,15 +25,17 @@ public static void Main(string[] args) {
                 SimulationMultiplier = 2,
             };
 
-            int skipCount = 278+12;
+            int skipCount = 278+45;
             string[] skipOpCodes = {"0F",                           // POP CS
 
                                                                     // These opcodes seem to have bugs
                                     "27", "2F", "37", "3F",         // DAA, DAS, AAA, AAS,
                                     "D2.0", "D2.1", "D2.2", "D2.3", // Group 2
                                     "D2.4", "D2.5", "D2.7",         // LOOPNE, LOOPE, LOOP
                                     "D3.0", "D3.1", "D3.2", "D3.3", // CALL, JMP (on some cases)
-                                    "D3.4", "D3.5", "D3.7",
+                                    "D3.4", "D3.5", "D3.7",         // MUL, IMUL, DIV (Group 3 | flags)
+                                                                    // IDIV, (Group 3 | flags & results!)
+                                                                    // CALL SP (Group 4/5 | flags)
                                     "D4", "D5",                     // AAM, AAD
 
 
@@ -76,7 +78,7 @@ public static void Main(string[] args) {
                     cpu.Registers.SS = tests[i].initial.regs.ss;
                     cpu.Flags.EFlags = tests[i].initial.regs.flags;
 
-                    //if(tests[i].test_hash == "3029050ee0c43649fa54b2a1784a759c9428dc7d762984fe98e0596f9424f691") Debugger.Break();
+//                    if(tests[i].test_hash == "32f8f22db991f65764f2d6dfae0c2ce8c266ab188138c670bffb69ced869c987") Debugger.Break();
 
                     Task.Run(async () => {
                         //while(cpu.Registers.IP != tests[i].final.regs.ip) {
@@ -134,9 +136,8 @@ private static void AnalyzeResult(Test currentTest) {
 
             if(!passed) {
                 Console.WriteLine($"\tTest Hash: {currentTest.test_hash}");
-                Console.ReadKey();
+                Console.ReadKey(true);
             }
-            //waiter.Set();
         }
 
         private static void LoadRam(int[][] ram) {

RunTests2/Properties/AssemblyInfo.cs

@@ -31,7 +31,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2024.3.12.597")]
-[assembly: AssemblyFileVersion("2024.3.12.597")]
+[assembly: AssemblyVersion("2024.3.12.646")]
+[assembly: AssemblyFileVersion("2024.3.12.646")]
 
-[assembly: AssemblyInformationalVersion("2024.3.12.597")]
+[assembly: AssemblyInformationalVersion("2024.3.12.646")]

x8086NetEmu/Helpers/OpCodes.vb

@@ -1054,7 +1054,8 @@ AddressOf _FE_FF}
     End Sub
 
     Private Sub _9C() ' PUSHF
-        PushIntoStack(If(mModel = Models.IBMPC_5150, &HFFF, &HFFFF) And mFlags.EFlags)
+        PushIntoStack(mFlags.EFlags)
+        'PushIntoStack(If(mModel = Models.IBMPC_5150, &HFFF, &HFFFF) And mFlags.EFlags)
         clkCyc += 10
     End Sub
 

x8086NetEmu/My Project/AssemblyInfo.vb

@@ -31,7 +31,7 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2024.3.12.10709")>
-<Assembly: AssemblyFileVersion("2024.3.12.10702")>
+<Assembly: AssemblyVersion("2024.3.12.10778")>
+<Assembly: AssemblyFileVersion("2024.3.12.10771")>
 
 <assembly: AssemblyInformationalVersion("2024.3.12")>

x8086NetEmu/x8086.vb

@@ -1918,14 +1918,14 @@ Public Class X8086
 
                 If addrMode.Size = DataSize.Byte Then
                     If result > &HFF Then
-                        HandleInterrupt(0, True)
+                        HandleInterrupt(0, False)
                         Exit Select
                     End If
                     mRegisters.AL = result
                     mRegisters.AH = remain
                 Else
                     If result > &HFFFF Then
-                        HandleInterrupt(0, True)
+                        HandleInterrupt(0, False)
                         Exit Select
                     End If
                     mRegisters.AX = result
@@ -2069,7 +2069,7 @@ Public Class X8086
                 mRegisters.CS = RAM16(mRegisters.ActiveSegmentValue, addrMode.IndAdr, 2)
                 clkCyc += 24
 
-            Case 6 ' PUSH Ev
+            Case 6, 7 ' PUSH Ev
                 If addrMode.IsDirect Then
                     If addrMode.Register2 = GPRegisters.RegistersTypes.SP Then
                         PushIntoStack(mRegisters.SP - 2)

x8086NetEmuConsole/My Project/AssemblyInfo.vb

@@ -31,7 +31,7 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2024.3.12.1789")>
-<Assembly: AssemblyFileVersion("2024.3.12.1784")>
+<Assembly: AssemblyVersion("2024.3.12.1793")>
+<Assembly: AssemblyFileVersion("2024.3.12.1788")>
 
 <assembly: AssemblyInformationalVersion("2024.3.12")>

x8086NetEmuWinForms/FormEmulator.vb

@@ -262,15 +262,15 @@ Public Class FormEmulator
         videoPort.Focus()
 
         cpu.Adapters.Add(New FloppyControllerAdapter(cpu))
-        cpu.Adapters.Add(New CGAWinForms(cpu, videoPort, If(ConsoleCrayon.RuntimeIsMono, VideoAdapter.FontSources.TrueType, VideoAdapter.FontSources.BitmapFile), "asciivga.dat", False))
-        'cpu.Adapters.Add(New VGAWinForms(cpu, videoPort, If(ConsoleCrayon.RuntimeIsMono, VideoAdapter.FontSources.TrueType, VideoAdapter.FontSources.BitmapFile), "asciivga.dat", False))
+        'cpu.Adapters.Add(New CGAWinForms(cpu, videoPort, If(ConsoleCrayon.RuntimeIsMono, VideoAdapter.FontSources.TrueType, VideoAdapter.FontSources.BitmapFile), "asciivga.dat", False))
+        cpu.Adapters.Add(New VGAWinForms(cpu, videoPort, If(ConsoleCrayon.RuntimeIsMono, VideoAdapter.FontSources.TrueType, VideoAdapter.FontSources.BitmapFile), "asciivga.dat", False))
         cpu.Adapters.Add(New KeyboardAdapter(cpu))
         cpu.Adapters.Add(New MouseAdapter(cpu)) ' This breaks many things (For example, MINIX and ELKS won't start, PC Tools' PCShell doesn't respond)
 
 #If Win32 Then
         cpu.Adapters.Add(New SpeakerAdpater(cpu))
         cpu.Adapters.Add(New AdlibAdapter(cpu))
-        'cpu.Adapters.Add(New SoundBlaster(cpu, cpu.Adapters.Last()))
+        cpu.Adapters.Add(New SoundBlaster(cpu, cpu.Adapters.Last()))
 #End If
 
 #If DEBUG Then

x8086NetEmuWinForms/My Project/AssemblyInfo.vb

@@ -31,7 +31,7 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2024.3.12.8691")>
-<Assembly: AssemblyFileVersion("2024.3.12.8689")>
+<Assembly: AssemblyVersion("2024.3.12.8727")>
+<Assembly: AssemblyFileVersion("2024.3.12.8725")>
 
 <assembly: AssemblyInformationalVersion("2024.3.12")>