Changeset 655 for GPL/branches/uniaud32-next/include/stacktoflat.h

Timestamp:

Jan 24, 2021, 9:19:48 AM (5 years ago)

Author:

Paul Smedley

Message:

Code cleanups from AlexT

File:

• GPL/branches/uniaud32-next/include/stacktoflat.h (modified) (3 diffs)

GPL/branches/uniaud32-next/include/stacktoflat.h

@@ -26 +26 @@
 #define __STACKTOFLAT_H__
 
+#ifdef KEE
+extern ULONG stacksel;          //16 bits stack selector
+#pragma aux stacksel "stacksel"
+
+extern ULONG stackbase;         //32 bits stackbase
+#pragma aux stackbase "stackbase"
+
+#else
+
 extern ULONG TKSSBase;
 #pragma aux TKSSBase "_TKSSBase"
@@ -33 +42 @@
   value [eax];
 
-#ifdef KEE
-extern ULONG stacksel;          //16 bits stack selector
-#pragma aux stacksel "stacksel"
-
-extern ULONG stackbase;         //32 bits stackbase
-#pragma aux stackbase "stackbase"
 #endif
-
-#ifdef FLATSTACK
 
 #ifdef KEE
@@ -49 +50 @@
 //Convert 16:16 stack based address to 0:32 flat addresss
 #define __Stack16ToFlat(addr)   (LINEAR)((((ULONG)addr)&0xffff) + *(ULONG *)TKSSBase)
-#endif
-
-//stack is already flat
-#define __Stack32ToFlat(addr)   (LINEAR)addr
-
-#else
-//Convert 16:16 stack based address to 0:32 flat addresss
-#define __Stack16ToFlat(addr)   (LINEAR)((((ULONG)addr)&0xffff) + *(ULONG *)TKSSBase)
-
-//Convert 16:16 stack based address to 0:32 flat addresss
-#define __Stack32ToFlat(addr)   (LINEAR)((((ULONG)addr)&0xffff) + *(ULONG *)TKSSBase)
 #endif