[NTVDM]
[reactos.git] / subsystems / ntvdm / emulator.c
index 42d709f..df30150 100644 (file)
@@ -12,6 +12,7 @@
 
 #include "emulator.h"
 #include "bios.h"
+#include "bop.h"
 #include "dos.h"
 #include "vga.h"
 #include "pic.h"
 
 /* PRIVATE VARIABLES **********************************************************/
 
-#ifndef NEW_EMULATOR
-softx86_ctx EmulatorContext;
-softx87_ctx FpuEmulatorContext;
-#else
 FAST486_STATE EmulatorContext;
-#endif
 
 static BOOLEAN A20Line = FALSE;
 
 /* PRIVATE FUNCTIONS **********************************************************/
 
-static VOID NTVDMCALL EmulatorReadMemory(PVOID Context, UINT Address, LPBYTE Buffer, INT Size)
+static VOID WINAPI EmulatorReadMemory(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size)
 {
-    UNREFERENCED_PARAMETER(Context);
+    UNREFERENCED_PARAMETER(State);
 
     /* If the A20 line is disabled, mask bit 20 */
     if (!A20Line) Address &= ~(1 << 20);
@@ -49,16 +45,16 @@ static VOID NTVDMCALL EmulatorReadMemory(PVOID Context, UINT Address, LPBYTE Buf
         && (Address < VgaGetVideoLimitAddress()))
     {
         DWORD VgaAddress = max(Address, VgaGetVideoBaseAddress());
-        LPBYTE VgaBuffer = &Buffer[VgaAddress - Address];
+        LPBYTE VgaBuffer = (LPBYTE)((ULONG_PTR)Buffer + VgaAddress - Address);
 
         /* Read from the VGA memory */
         VgaReadMemory(VgaAddress, VgaBuffer, Size);
     }
 }
 
-static VOID NTVDMCALL EmulatorWriteMemory(PVOID Context, UINT Address, LPBYTE Buffer, INT Size)
+static VOID WINAPI EmulatorWriteMemory(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size)
 {
-    UNREFERENCED_PARAMETER(Context);
+    UNREFERENCED_PARAMETER(State);
 
     /* If the A20 line is disabled, mask bit 20 */
     if (!A20Line) Address &= ~(1 << 20);
@@ -77,359 +73,208 @@ static VOID NTVDMCALL EmulatorWriteMemory(PVOID Context, UINT Address, LPBYTE Bu
         && (Address < VgaGetVideoLimitAddress()))
     {
         DWORD VgaAddress = max(Address, VgaGetVideoBaseAddress());
-        LPBYTE VgaBuffer = &Buffer[VgaAddress - Address];
+        LPBYTE VgaBuffer = (LPBYTE)((ULONG_PTR)Buffer + VgaAddress - Address);
 
         /* Write to the VGA memory */
         VgaWriteMemory(VgaAddress, VgaBuffer, Size);
     }
 }
 
-static VOID NTVDMCALL EmulatorReadIo(PVOID Context, UINT Address, LPBYTE Buffer, INT Size)
+static VOID WINAPI EmulatorReadIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size)
 {
-    UNREFERENCED_PARAMETER(Context);
-    UNREFERENCED_PARAMETER(Size);
+    INT i;
+    LPBYTE Address = (LPBYTE)Buffer;
 
-    switch (Address)
-    {
-        case PIC_MASTER_CMD:
-        case PIC_SLAVE_CMD:
-        {
-            *Buffer = PicReadCommand(Address);
-            break;
-        }
-
-        case PIC_MASTER_DATA:
-        case PIC_SLAVE_DATA:
-        {
-            *Buffer = PicReadData(Address);
-            break;
-        }
-
-        case PIT_DATA_PORT(0):
-        case PIT_DATA_PORT(1):
-        case PIT_DATA_PORT(2):
-        {
-            *Buffer = PitReadData(Address - PIT_DATA_PORT(0));
-            break;
-        }
-
-        case PS2_CONTROL_PORT:
-        {
-            *Buffer = KeyboardReadStatus();
-            break;
-        }
-
-        case PS2_DATA_PORT:
-        {
-            *Buffer = KeyboardReadData();
-            break;
-        }
+    UNREFERENCED_PARAMETER(State);
 
-        case VGA_AC_WRITE:
-        case VGA_AC_READ:
-        case VGA_SEQ_INDEX:
-        case VGA_SEQ_DATA:
-        case VGA_DAC_READ_INDEX:
-        case VGA_DAC_WRITE_INDEX:
-        case VGA_DAC_DATA:
-        case VGA_MISC_READ:
-        case VGA_MISC_WRITE:
-        case VGA_CRTC_INDEX:
-        case VGA_CRTC_DATA:
-        case VGA_GC_INDEX:
-        case VGA_GC_DATA:
-        case VGA_STAT_MONO:
-        case VGA_STAT_COLOR:
-        {
-            *Buffer = VgaReadPort(Address);
-            break;
-        }
-
-        default:
-        {
-            DPRINT1("Read from unknown port: 0x%X\n", Address);
-        }
-    }
-}
-
-static VOID NTVDMCALL EmulatorWriteIo(PVOID Context, UINT Address, LPBYTE Buffer, INT Size)
-{
-    BYTE Byte = *Buffer;
-
-    UNREFERENCED_PARAMETER(Context);
-    UNREFERENCED_PARAMETER(Size);
-
-    switch (Address)
+    for (i = 0; i < Size; i++)
     {
-        case PIT_COMMAND_PORT:
+        switch (Port)
         {
-            PitWriteCommand(Byte);
-            break;
-        }
-
-        case PIT_DATA_PORT(0):
-        case PIT_DATA_PORT(1):
-        case PIT_DATA_PORT(2):
-        {
-            PitWriteData(Address - PIT_DATA_PORT(0), Byte);
-            break;
-        }
+            case PIC_MASTER_CMD:
+            case PIC_SLAVE_CMD:
+            {
+                *(Address++) = PicReadCommand(Port);
+                break;
+            }
 
-        case PIC_MASTER_CMD:
-        case PIC_SLAVE_CMD:
-        {
-            PicWriteCommand(Address, Byte);
-            break;
-        }
+            case PIC_MASTER_DATA:
+            case PIC_SLAVE_DATA:
+            {
+                *(Address++) = PicReadData(Port);
+                break;
+            }
 
-        case PIC_MASTER_DATA:
-        case PIC_SLAVE_DATA:
-        {
-            PicWriteData(Address, Byte);
-            break;
-        }
+            case PIT_DATA_PORT(0):
+            case PIT_DATA_PORT(1):
+            case PIT_DATA_PORT(2):
+            {
+                *(Address++) = PitReadData(Port - PIT_DATA_PORT(0));
+                break;
+            }
 
-        case PS2_CONTROL_PORT:
-        {
-            KeyboardWriteCommand(Byte);
-            break;
-        }
+            case PS2_CONTROL_PORT:
+            {
+                *(Address++) = KeyboardReadStatus();
+                break;
+            }
 
-        case PS2_DATA_PORT:
-        {
-            KeyboardWriteData(Byte);
-            break;
-        }
+            case PS2_DATA_PORT:
+            {
+                *(Address++) = KeyboardReadData();
+                break;
+            }
 
-        case VGA_AC_WRITE:
-        case VGA_AC_READ:
-        case VGA_SEQ_INDEX:
-        case VGA_SEQ_DATA:
-        case VGA_DAC_READ_INDEX:
-        case VGA_DAC_WRITE_INDEX:
-        case VGA_DAC_DATA:
-        case VGA_MISC_READ:
-        case VGA_MISC_WRITE:
-        case VGA_CRTC_INDEX:
-        case VGA_CRTC_DATA:
-        case VGA_GC_INDEX:
-        case VGA_GC_DATA:
-        case VGA_STAT_MONO:
-        case VGA_STAT_COLOR:
-        {
-            VgaWritePort(Address, Byte);
-            break;
-        }
+            case VGA_AC_WRITE:
+            case VGA_AC_READ:
+            case VGA_SEQ_INDEX:
+            case VGA_SEQ_DATA:
+            case VGA_DAC_READ_INDEX:
+            case VGA_DAC_WRITE_INDEX:
+            case VGA_DAC_DATA:
+            case VGA_MISC_READ:
+            case VGA_MISC_WRITE:
+            case VGA_CRTC_INDEX:
+            case VGA_CRTC_DATA:
+            case VGA_GC_INDEX:
+            case VGA_GC_DATA:
+            case VGA_STAT_MONO:
+            case VGA_STAT_COLOR:
+            {
+                *(Address++) = VgaReadPort(Port);
+                break;
+            }
 
-        default:
-        {
-            DPRINT1("Write to unknown port: 0x%X\n", Address);
+            default:
+            {
+                DPRINT1("Read from unknown port: 0x%X\n", Port);
+            }
         }
     }
 }
 
-static VOID EmulatorBop(WORD Code)
+static VOID WINAPI EmulatorWriteIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size)
 {
-    WORD StackSegment, StackPointer, CodeSegment, InstructionPointer;
-    BYTE IntNum;
-    LPWORD Stack;
+    INT i;
+    LPBYTE Address = (LPBYTE)Buffer;
 
-    /* Get the SS:SP */
-#ifndef NEW_EMULATOR
-    StackSegment = EmulatorContext.state->segment_reg[SX86_SREG_SS].val;
-    StackPointer = EmulatorContext.state->general_reg[SX86_REG_SP].val;
-#else
-    StackSegment = EmulatorContext.SegmentRegs[FAST486_REG_SS].Selector;
-    StackPointer = EmulatorContext.GeneralRegs[FAST486_REG_ESP].LowWord;
-#endif
-
-    /* Get the stack */
-    Stack = (LPWORD)((ULONG_PTR)BaseAddress + TO_LINEAR(StackSegment, StackPointer));
+    UNREFERENCED_PARAMETER(State);
 
-    if (Code == EMULATOR_INT_BOP)
+    for (i = 0; i < Size; i++)
     {
-        /* Get the interrupt number */
-        IntNum = LOBYTE(Stack[STACK_INT_NUM]);
-
-        /* Get the CS:IP */
-        InstructionPointer = Stack[STACK_IP];
-        CodeSegment = Stack[STACK_CS];
-
-        /* Check if this was an exception */
-        if (IntNum < 8)
+        switch (Port)
         {
-            /* Display a message to the user */
-            DisplayMessage(L"Exception: %s occured at %04X:%04X",
-                           ExceptionName[IntNum],
-                           CodeSegment,
-                           InstructionPointer);
-
-            /* Stop the VDM */
-            VdmRunning = FALSE;
-            return;
-        }
-
-        /* Check if this was an PIC IRQ */
-        if (IntNum >= BIOS_PIC_MASTER_INT && IntNum < BIOS_PIC_MASTER_INT + 8)
-        {
-            /* It was an IRQ from the master PIC */
-            BiosHandleIrq(IntNum - BIOS_PIC_MASTER_INT, Stack);
-            return;
-        }
-        else if (IntNum >= BIOS_PIC_SLAVE_INT && IntNum < BIOS_PIC_SLAVE_INT + 8)
-        {
-            /* It was an IRQ from the slave PIC */
-            BiosHandleIrq(IntNum - BIOS_PIC_SLAVE_INT + 8, Stack);
-            return;
-        }
-
-        switch (IntNum)
-        {
-            case BIOS_VIDEO_INTERRUPT:
+            case PIT_COMMAND_PORT:
             {
-                /* This is the video BIOS interrupt, call the BIOS */
-                BiosVideoService(Stack);
+                PitWriteCommand(*(Address++));
                 break;
             }
-            case BIOS_EQUIPMENT_INTERRUPT:
-            {
-                /* This is the BIOS "get equipment" command, call the BIOS */
-                BiosEquipmentService(Stack);
-                break;
-            }
-            case BIOS_KBD_INTERRUPT:
+
+            case PIT_DATA_PORT(0):
+            case PIT_DATA_PORT(1):
+            case PIT_DATA_PORT(2):
             {
-                /* This is the keyboard BIOS interrupt, call the BIOS */
-                BiosKeyboardService(Stack);
+                PitWriteData(Port - PIT_DATA_PORT(0), *(Address++));
                 break;
             }
-            case BIOS_TIME_INTERRUPT:
+
+            case PIC_MASTER_CMD:
+            case PIC_SLAVE_CMD:
             {
-                /* This is the time BIOS interrupt, call the BIOS */
-                BiosTimeService(Stack);
+                PicWriteCommand(Port, *(Address++));
                 break;
             }
-            case BIOS_SYS_TIMER_INTERRUPT:
+
+            case PIC_MASTER_DATA:
+            case PIC_SLAVE_DATA:
             {
-                /* BIOS timer update */
-                BiosSystemTimerInterrupt(Stack);
+                PicWriteData(Port, *(Address++));
                 break;
             }
-            case 0x20:
+
+            case PS2_CONTROL_PORT:
             {
-                DosInt20h(Stack);
+                KeyboardWriteCommand(*(Address++));
                 break;
             }
-            case 0x21:
+
+            case PS2_DATA_PORT:
             {
-                DosInt21h(Stack);
+                KeyboardWriteData(*(Address++));
                 break;
             }
-            case 0x23:
+
+            case VGA_AC_WRITE:
+            case VGA_AC_READ:
+            case VGA_SEQ_INDEX:
+            case VGA_SEQ_DATA:
+            case VGA_DAC_READ_INDEX:
+            case VGA_DAC_WRITE_INDEX:
+            case VGA_DAC_DATA:
+            case VGA_MISC_READ:
+            case VGA_MISC_WRITE:
+            case VGA_CRTC_INDEX:
+            case VGA_CRTC_DATA:
+            case VGA_GC_INDEX:
+            case VGA_GC_DATA:
+            case VGA_STAT_MONO:
+            case VGA_STAT_COLOR:
             {
-                DosBreakInterrupt(Stack);
+                VgaWritePort(Port, *(Address++));
                 break;
             }
+
             default:
             {
-                DPRINT1("Unhandled interrupt: 0x%02X\n", IntNum);
-                break;
+                DPRINT1("Write to unknown port: 0x%X\n", Port);
             }
         }
     }
 }
 
-#ifdef NEW_EMULATOR
-static VOID WINAPI EmulatorBiosOperation(PFAST486_STATE State, WORD Code)
+static VOID WINAPI EmulatorBiosOperation(PFAST486_STATE State, UCHAR BopCode)
 {
-    /*
-     * HACK: To maintain softx86 compatbility, just call the old EmulatorBop here.
-     * Later on, when softx86 is no longer needed, the code from EmulatorBop should
-     * be moved here and should use the "State" variable.
-     */
-    EmulatorBop(Code);
-}
-
-#endif
-
-#ifndef NEW_EMULATOR
-
-static VOID EmulatorSoftwareInt(PVOID Context, BYTE Number)
-{
-    UNREFERENCED_PARAMETER(Context);
-    UNREFERENCED_PARAMETER(Number);
+    WORD StackSegment, StackPointer;
+    LPWORD Stack;
 
-    /* Do nothing */
-}
+    /* Get the SS:SP */
+    StackSegment = State->SegmentRegs[FAST486_REG_SS].Selector;
+    StackPointer = State->GeneralRegs[FAST486_REG_ESP].LowWord;
 
-static VOID EmulatorHardwareInt(PVOID Context, BYTE Number)
-{
-    UNREFERENCED_PARAMETER(Context);
-    UNREFERENCED_PARAMETER(Number);
+    /* Get the stack */
+    Stack = (LPWORD)SEG_OFF_TO_PTR(StackSegment, StackPointer);
 
-    /* Do nothing */
+    if (BopProc[BopCode] != NULL)
+        BopProc[BopCode](Stack);
+    else
+        DPRINT1("Invalid BOP code %u\n", BopCode);
 }
 
-static VOID EmulatorHardwareIntAck(PVOID Context, BYTE Number)
+static UCHAR WINAPI EmulatorIntAcknowledge(PFAST486_STATE State)
 {
-    UNREFERENCED_PARAMETER(Context);
-    UNREFERENCED_PARAMETER(Number);
+    UNREFERENCED_PARAMETER(State);
 
-    /* Do nothing */
+    /* Get the interrupt number from the PIC */
+    return PicGetInterrupt();
 }
 
-#endif
-
 /* PUBLIC FUNCTIONS ***********************************************************/
 
-BOOLEAN EmulatorInitialize()
+BOOLEAN EmulatorInitialize(VOID)
 {
     /* Allocate memory for the 16-bit address space */
     BaseAddress = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MAX_ADDRESS);
     if (BaseAddress == NULL) return FALSE;
 
-#ifndef NEW_EMULATOR
-    /* Initialize the softx86 CPU emulator */
-    if (!softx86_init(&EmulatorContext, SX86_CPULEVEL_80286))
-    {
-        HeapFree(GetProcessHeap(), 0, BaseAddress);
-        return FALSE;
-    }
-
-    /* Initialize the softx87 FPU emulator*/
-    if(!softx87_init(&FpuEmulatorContext, SX87_FPULEVEL_8087))
-    {
-        softx86_free(&EmulatorContext);
-        HeapFree(GetProcessHeap(), 0, BaseAddress);
-        return FALSE;
-    }
-
-    /* Set memory read/write callbacks */
-    EmulatorContext.callbacks->on_read_memory = EmulatorReadMemory;
-    EmulatorContext.callbacks->on_write_memory = EmulatorWriteMemory;
-
-    /* Set MMIO read/write callbacks */
-    EmulatorContext.callbacks->on_read_io = EmulatorReadIo;
-    EmulatorContext.callbacks->on_write_io = EmulatorWriteIo;
-
-    /* Set interrupt callbacks */
-    EmulatorContext.callbacks->on_sw_int = EmulatorSoftwareInt;
-    EmulatorContext.callbacks->on_hw_int = EmulatorHardwareInt;
-    EmulatorContext.callbacks->on_hw_int_ack = EmulatorHardwareIntAck;
-
-    /* Connect the emulated FPU to the emulated CPU */
-    softx87_connect_to_CPU(&EmulatorContext, &FpuEmulatorContext);
-#else
-    /* Set the callbacks */
-    EmulatorContext.MemReadCallback = (FAST486_MEM_READ_PROC)EmulatorReadMemory;
-    EmulatorContext.MemWriteCallback = (FAST486_MEM_WRITE_PROC)EmulatorWriteMemory;
-    EmulatorContext.IoReadCallback = (FAST486_IO_READ_PROC)EmulatorReadIo;
-    EmulatorContext.IoWriteCallback = (FAST486_IO_WRITE_PROC)EmulatorWriteIo;
-    EmulatorContext.BopCallback = (FAST486_BOP_PROC)EmulatorBiosOperation;
-
-    /* Reset the CPU */
-    Fast486Reset(&EmulatorContext);
-#endif
+    /* Initialize the CPU */
+    Fast486Initialize(&EmulatorContext,
+                      EmulatorReadMemory,
+                      EmulatorWriteMemory,
+                      EmulatorReadIo,
+                      EmulatorWriteIo,
+                      NULL,
+                      EmulatorBiosOperation,
+                      EmulatorIntAcknowledge);
 
     /* Enable interrupts */
     EmulatorSetFlag(EMULATOR_FLAG_IF);
@@ -437,69 +282,38 @@ BOOLEAN EmulatorInitialize()
     return TRUE;
 }
 
+VOID EmulatorCleanup(VOID)
+{
+    /* Free the memory allocated for the 16-bit address space */
+    if (BaseAddress != NULL) HeapFree(GetProcessHeap(), 0, BaseAddress);
+}
+
 VOID EmulatorSetStack(WORD Segment, DWORD Offset)
 {
-#ifndef NEW_EMULATOR
-    /* Call the softx86 API */
-    softx86_set_stack_ptr(&EmulatorContext, Segment, Offset);
-#else
     Fast486SetStack(&EmulatorContext, Segment, Offset);
-#endif
 }
 
 // FIXME: This function assumes 16-bit mode!!!
 VOID EmulatorExecute(WORD Segment, WORD Offset)
 {
-#ifndef NEW_EMULATOR
-    /* Call the softx86 API */
-    softx86_set_instruction_ptr(&EmulatorContext, Segment, Offset);
-#else
     /* Tell Fast486 to move the instruction pointer */
     Fast486ExecuteAt(&EmulatorContext, Segment, Offset);
-#endif
 }
 
 VOID EmulatorInterrupt(BYTE Number)
 {
-#ifndef NEW_EMULATOR
-    LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress);
-    UINT Segment, Offset;
-
-    /* Get the segment and offset */
-    Segment = HIWORD(IntVecTable[Number]);
-    Offset = LOWORD(IntVecTable[Number]);
-
-    /* Call the softx86 API */
-    softx86_make_simple_interrupt_call(&EmulatorContext, &Segment, &Offset);
-#else
     /* Call the Fast486 API */
     Fast486Interrupt(&EmulatorContext, Number);
-#endif
 }
 
-VOID EmulatorExternalInterrupt(BYTE Number)
+VOID EmulatorInterruptSignal(VOID)
 {
-#ifndef NEW_EMULATOR
-    /* Call the softx86 API */
-    softx86_ext_hw_signal(&EmulatorContext, Number);
-#else
     /* Call the Fast486 API */
-    Fast486Interrupt(&EmulatorContext, Number);
-#endif
+    Fast486InterruptSignal(&EmulatorContext);
 }
 
 ULONG EmulatorGetRegister(ULONG Register)
 {
-#ifndef NEW_EMULATOR
-    if (Register < EMULATOR_REG_ES)
-    {
-        return EmulatorContext.state->general_reg[Register].val;
-    }
-    else
-    {
-        return EmulatorContext.state->segment_reg[Register - EMULATOR_REG_ES].val;
-    }
-#else
     if (Register < EMULATOR_REG_ES)
     {
         return EmulatorContext.GeneralRegs[Register].Long;
@@ -508,30 +322,10 @@ ULONG EmulatorGetRegister(ULONG Register)
     {
         return EmulatorContext.SegmentRegs[Register - EMULATOR_REG_ES].Selector;
     }
-#endif
-}
-
-ULONG EmulatorGetProgramCounter(VOID)
-{
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->reg_ip;
-#else
-    return EmulatorContext.InstPtr.Long;
-#endif
 }
 
 VOID EmulatorSetRegister(ULONG Register, ULONG Value)
 {
-#ifndef NEW_EMULATOR
-    if (Register < EMULATOR_REG_ES)
-    {
-        EmulatorContext.state->general_reg[Register].val = Value;
-    }
-    else
-    {
-        EmulatorContext.state->segment_reg[Register - EMULATOR_REG_ES].val = (USHORT)Value;
-    }
-#else
     if (Register < EMULATOR_REG_ES)
     {
         EmulatorContext.GeneralRegs[Register].Long = Value;
@@ -540,88 +334,35 @@ VOID EmulatorSetRegister(ULONG Register, ULONG Value)
     {
         Fast486SetSegment(&EmulatorContext, Register - EMULATOR_REG_ES, (USHORT)Value);
     }
-#endif
+}
+
+ULONG EmulatorGetProgramCounter(VOID)
+{
+    return EmulatorContext.InstPtr.Long;
 }
 
 BOOLEAN EmulatorGetFlag(ULONG Flag)
 {
-#ifndef NEW_EMULATOR
-    return (EmulatorContext.state->reg_flags.val & Flag) ? TRUE : FALSE;
-#else
     return (EmulatorContext.Flags.Long & Flag) ? TRUE : FALSE;
-#endif
 }
 
 VOID EmulatorSetFlag(ULONG Flag)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->reg_flags.val |= Flag;
-#else
     EmulatorContext.Flags.Long |= Flag;
-#endif
 }
 
 VOID EmulatorClearFlag(ULONG Flag)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->reg_flags.val &= ~Flag;
-#else
     EmulatorContext.Flags.Long &= ~Flag;
-#endif
 }
 
 VOID EmulatorStep(VOID)
 {
-#ifndef NEW_EMULATOR
-    LPWORD Instruction;
-
-    /* Print the current position - useful for debugging */
-    DPRINT("Executing at CS:IP = %04X:%04X\n",
-           EmulatorGetRegister(EMULATOR_REG_CS),
-           EmulatorContext.state->reg_ip);
-
-    Instruction = (LPWORD)((ULONG_PTR)BaseAddress
-                           + TO_LINEAR(EmulatorGetRegister(EMULATOR_REG_CS),
-                           EmulatorContext.state->reg_ip));
-
-    /* Check for the BIOS operation (BOP) sequence */
-    if (Instruction[0] == EMULATOR_BOP)
-    {
-        /* Skip the opcodes */
-        EmulatorContext.state->reg_ip += 4;
-
-        // HACK: Refresh the display because the called function may wait.
-        VgaRefreshDisplay();
-
-        /* Call the BOP handler */
-        EmulatorBop(Instruction[1]);
-    }
-
-    /* Call the softx86 API */
-    if (!softx86_step(&EmulatorContext))
-    {
-        /* Invalid opcode */
-        EmulatorInterrupt(EMULATOR_EXCEPTION_INVALID_OPCODE);
-    }
-#else
     /* Dump the state for debugging purposes */
     // Fast486DumpState(&EmulatorContext);
 
     /* Execute the next instruction */
     Fast486StepInto(&EmulatorContext);
-#endif
-}
-
-VOID EmulatorCleanup(VOID)
-{
-#ifndef NEW_EMULATOR
-    /* Free the softx86 CPU and FPU emulator */
-    softx87_free(&FpuEmulatorContext);
-    softx86_free(&EmulatorContext);
-#endif
-
-    /* Free the memory allocated for the 16-bit address space */
-    if (BaseAddress != NULL) HeapFree(GetProcessHeap(), 0, BaseAddress);
 }
 
 VOID EmulatorSetA20(BOOLEAN Enabled)