[NTVDM]

[reactos.git] / subsystems / ntvdm / emulator.h

diff --git a/subsystems/ntvdm/emulator.h b/subsystems/ntvdm/emulator.h
index 5b6ec6b..0906c7d 100644 (file)
--- a/subsystems/ntvdm/emulator.h
+++ b/subsystems/ntvdm/emulator.h
@@ -12,13 +12,7 @@
 /* INCLUDES *******************************************************************/
 
 #include "ntvdm.h"
-
-#ifndef NEW_EMULATOR
-#include <softx86.h>
-#include <softx87.h>
-#else
 #include <fast486.h>
-#endif
 
 /* DEFINES ********************************************************************/
 
@@ -43,10 +37,11 @@
 /* Common definitions */
 #define EMULATOR_BOP 0xC4C4
 #define EMULATOR_INT_BOP 0xBEEF
-#define STACK_INT_NUM 0
-#define STACK_IP 1
-#define STACK_CS 2
-#define STACK_FLAGS 3
+#define STACK_COUNTER 0
+#define STACK_INT_NUM 1
+#define STACK_IP 2
+#define STACK_CS 3
+#define STACK_FLAGS 4
 
 enum
 {
@@ -85,19 +80,8 @@ enum
     EMULATOR_REG_GS
 };
 
-#ifndef NEW_EMULATOR
-
-#define NTVDMCALL __cdecl
-extern softx86_ctx EmulatorContext;
-extern softx87_ctx FpuEmulatorContext;
-
-#else
-
-#define NTVDMCALL __stdcall
 extern FAST486_STATE EmulatorContext;
 
-#endif
-
 /* FUNCTIONS ******************************************************************/
 
 BOOLEAN EmulatorInitialize();