Changeset 679 for GPL/trunk/include/stacktoflat.h

Timestamp:

Mar 18, 2021, 8:57:36 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• include/stacktoflat.h (modified) (3 diffs)

GPL/trunk/include/stacktoflat.h

@@ -26 +26 @@
 #define __STACKTOFLAT_H__
 
-extern ULONG TKSSBase;
-#pragma aux TKSSBase "_TKSSBase"
-
-extern ULONG GetTKSSBase();
-#pragma aux GetTKSSBase "GetTKSSBase" \
-  value [eax];
-
-#ifdef KEE
 extern ULONG stacksel;          //16 bits stack selector
 #pragma aux stacksel "stacksel"
@@ -39 +31 @@
 extern ULONG stackbase;         //32 bits stackbase
 #pragma aux stackbase "stackbase"
-#endif
 
-#ifdef FLATSTACK
-
-#ifdef KEE
 //Convert 16:16 stack based address to 0:32 flat addresss
 #define __Stack16ToFlat(addr)   (LINEAR)((ULONG)(addr&0xffff) + stackbase)
-#else
-//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
 
 // Convert 16:16 pointer to 16:32
@@ -115 +88 @@
 #define FLATPTR(a)      GETFLATPTR((char FAR48 *)a)
 
-#ifdef KEE
 #define FlatToSel(addr32)       ((stacksel << 16) | (((ULONG)addr32 - stackbase) & 0xffff))
-#else
-//Only valid for stack based pointer!!
-ULONG FlatToSel(ULONG addr32);
-#endif
 
 #endif