projects / reactos.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[NTVDM]
[reactos.git] / subsystems / ntvdm / registers.c
diff --git a/subsystems/ntvdm/registers.c b/subsystems/ntvdm/registers.c
index c56a683..3319a96 100644 (file)
--- a/subsystems/ntvdm/registers.c
+++ b/subsystems/ntvdm/registers.c
@@ -18,176 +18,112 @@ ULONG
 CDECL
 getEAX(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_AX].val;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_AX].Long;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_AX].Long;
 }
 
 VOID
 CDECL
 setEAX(ULONG Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_AX].val = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_AX].Long = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_AX].Long = Value;
 }
 
 USHORT
 CDECL
 getAX(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_AX].w.lo;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_AX].LowWord;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_AX].LowWord;
 }
 
 VOID
 CDECL
 setAX(USHORT Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_AX].w.lo = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_AX].LowWord = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_AX].LowWord = Value;
 }
 
 UCHAR
 CDECL
 getAH(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_AX].b.hi;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_AX].HighByte;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_AX].HighByte;
 }
 
 VOID
 CDECL
 setAH(UCHAR Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_AX].b.hi = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_AX].HighByte = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_AX].HighByte = Value;
 }
 
 UCHAR
 CDECL
 getAL(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_AX].b.lo;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_AX].LowByte;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_AX].LowByte;
 }
 
 VOID
 CDECL
 setAL(UCHAR Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_AX].b.lo = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_AX].LowByte = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_AX].LowByte = Value;
 }
 
 ULONG
 CDECL
 getEBX(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_BX].val;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_BX].Long;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_BX].Long;
 }
 
 VOID
 CDECL
 setEBX(ULONG Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_BX].val = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_BX].Long = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_BX].Long = Value;
 }
 
 USHORT
 CDECL
 getBX(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_BX].w.lo;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_BX].LowWord;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_BX].LowWord;
 }
 
 VOID
 CDECL
 setBX(USHORT Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_BX].w.lo = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_BX].LowWord = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_BX].LowWord = Value;
 }
 
 UCHAR
 CDECL
 getBH(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_BX].b.hi;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_BX].HighByte;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_BX].HighByte;
 }
 
 VOID
 CDECL
 setBH(UCHAR Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_BX].b.hi = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_BX].HighByte = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_BX].HighByte = Value;
 }
 
 UCHAR
 CDECL
 getBL(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_BX].b.lo;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_BX].LowByte;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_BX].LowByte;
 }
 
 VOID
 CDECL
 setBL(UCHAR Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_BX].b.lo = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_BX].LowByte = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_BX].LowByte = Value;
 }
 
 
@@ -196,88 +132,56 @@ ULONG
 CDECL
 getECX(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_CX].val;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_CX].Long;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_CX].Long;
 }
 
 VOID
 CDECL
 setECX(ULONG Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_CX].val = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_CX].Long = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_CX].Long = Value;
 }
 
 USHORT
 CDECL
 getCX(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_CX].w.lo;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_CX].LowWord;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_CX].LowWord;
 }
 
 VOID
 CDECL
 setCX(USHORT Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_CX].w.lo = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_CX].LowWord = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_CX].LowWord = Value;
 }
 
 UCHAR
 CDECL
 getCH(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_CX].b.hi;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_CX].HighByte;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_CX].HighByte;
 }
 
 VOID
 CDECL
 setCH(UCHAR Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_CX].b.hi = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_CX].HighByte = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_CX].HighByte = Value;
 }
 
 UCHAR
 CDECL
 getCL(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_CX].b.lo;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_CX].LowByte;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_CX].LowByte;
 }
 
 VOID
 CDECL
 setCL(UCHAR Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_CX].b.lo = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_CX].LowByte = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_CX].LowByte = Value;
 }
 
 
@@ -286,88 +190,56 @@ ULONG
 CDECL
 getEDX(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_DX].val;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_DX].Long;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_DX].Long;
 }
 
 VOID
 CDECL
 setEDX(ULONG Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_DX].val = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_DX].Long = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_DX].Long = Value;
 }
 
 USHORT
 CDECL
 getDX(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_DX].w.lo;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_DX].LowWord;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_DX].LowWord;
 }
 
 VOID
 CDECL
 setDX(USHORT Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_DX].w.lo = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_DX].LowWord = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_DX].LowWord = Value;
 }
 
 UCHAR
 CDECL
 getDH(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_DX].b.hi;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_DX].HighByte;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_DX].HighByte;
 }
 
 VOID
 CDECL
 setDH(UCHAR Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_DX].b.hi = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_DX].HighByte = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_DX].HighByte = Value;
 }
 
 UCHAR
 CDECL
 getDL(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_DX].b.lo;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_DX].LowByte;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_DX].LowByte;
 }
 
 VOID
 CDECL
 setDL(UCHAR Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_DX].b.lo = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_DX].LowByte = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_DX].LowByte = Value;
 }
 
 
@@ -406,44 +278,28 @@ ULONG
 CDECL
 getEBP(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_BP].val;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_BP].Long;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_BP].Long;
 }
 
 VOID
 CDECL
 setEBP(ULONG Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_BP].val = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_BP].Long = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_BP].Long = Value;
 }
 
 USHORT
 CDECL
 getBP(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_BP].w.lo;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_BP].LowWord;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_BP].LowWord;
 }
 
 VOID
 CDECL
 setBP(USHORT Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_BP].w.lo = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_BP].LowWord = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_BP].LowWord = Value;
 }
 
 
@@ -452,44 +308,28 @@ ULONG
 CDECL
 getESI(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_SI].val;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_SI].Long;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_SI].Long;
 }
 
 VOID
 CDECL
 setESI(ULONG Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_SI].val = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_SI].Long = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_SI].Long = Value;
 }
 
 USHORT
 CDECL
 getSI(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_SI].w.lo;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_SI].LowWord;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_SI].LowWord;
 }
 
 VOID
 CDECL
 setSI(USHORT Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_SI].w.lo = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_SI].LowWord = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_SI].LowWord = Value;
 }
 
 
@@ -498,44 +338,28 @@ ULONG
 CDECL
 getEDI(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_DI].val;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_DI].Long;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_DI].Long;
 }
 
 VOID
 CDECL
 setEDI(ULONG Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_DI].val = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_DI].Long = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_DI].Long = Value;
 }
 
 USHORT
 CDECL
 getDI(VOID)
 {
-#ifndef NEW_EMULATOR
-    return EmulatorContext.state->general_reg[EMULATOR_REG_DI].w.lo;
-#else
-    return EmulatorContext.Registers[EMULATOR_REG_DI].LowWord;
-#endif
+    return EmulatorContext.GeneralRegs[EMULATOR_REG_DI].LowWord;
 }
 
 VOID
 CDECL
 setDI(USHORT Value)
 {
-#ifndef NEW_EMULATOR
-    EmulatorContext.state->general_reg[EMULATOR_REG_DI].w.lo = Value;
-#else
-    EmulatorContext.Registers[EMULATOR_REG_DI].LowWord = Value;
-#endif
+    EmulatorContext.GeneralRegs[EMULATOR_REG_DI].LowWord = Value;
 }
 
 
A free Windows-compatible Operating System