====XMS MOSTLY translated but crashes EXMMTEST.EXE ====

[16.git] / src / lib / 16_mm.h

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index d351abfa8f868a004be425755ce6f2f37a5910a5..7c681255d63b52ee9cc50c27c5fa18c362d94f63 100755 (executable)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -25,12 +25,12 @@
 #include <malloc.h>\r
 #include "src/lib/16_head.h"\r
 #include "src/lib/16_hc.h"\r
-#include "src/lib/16_lib.h"\r
+#include "src/lib/16_tail.h"\r
 //++++mh       #include "src/lib/16_in.h"\r
 \r
-\r
 #ifdef __DEBUG__               // 1 == Debug/Dev  ;  0 == Production/final\r
 #define OUT_OF_MEM_MSG "MM_GetPtr: Out of memory!\nYou were short :%lu bytes\n"\r
+extern boolean debugpm;\r
 #else\r
 #define OUT_OF_MEM_MSG "\npee\n"\r
 #endif\r
@@ -66,11 +66,13 @@
 //--------\r
 \r
 #define        XMS_INT                 0x2f\r
-#define        XMSD                    dword XMSDriver=gvar->pm.xmm.XMSDriver;\r
+#define        XMS_CALL(v)             _AH = (v);\\r
+                                               __asm call [WORD PTR XMSDriver]\r
+/*__asm { mov ah,[v]\*///}\r
 \r
 #define        XMS_VERSION             0x00\r
 \r
-#define        XMS_ALLOCHMA    0x01\r
+#define        XMS_ALLOCHMA            0x01\r
 #define        XMS_FREEHMA             0x02\r
 \r
 #define        XMS_GENABLEA20  0x03\r
@@ -81,14 +83,14 @@
 \r
 #define        XMS_QUERYFREE   0x08\r
 #define        XMS_ALLOC               0x09\r
-#define        XMS_FREE                0x0A\r
-#define        XMS_MOVE                0x0B\r
-#define        XMS_LOCK                0x0C\r
+#define        XMS_FREE                        0x0A\r
+#define        XMS_MOVE                        0x0B\r
+#define        XMS_LOCK                        0x0C\r
 #define        XMS_UNLOCK              0x0D\r
 #define        XMS_GETINFO             0x0E\r
 #define        XMS_RESIZE              0x0F\r
 \r
-#define        XMS_ALLOCUMB    0x10\r
+#define        XMS_ALLOCUMB            0x10\r
 #define        XMS_FREEUMB             0x11\r
 \r
 //==========================================================================\r
@@ -103,7 +105,7 @@
 \r
 extern void            (* beforesort) (void);\r
 extern void            (* aftersort) (void);\r
-extern void            (* XMSaddr) (void);             // far pointer to XMS driver\r
+extern void            (* XMSaddr) (void);             // far pointer to XMS driver\r
 \r
 //==========================================================================\r
 \r
@@ -205,7 +207,6 @@ void MM_Report_(global_game_variables_t *gvar);
 void MM_BombOnError(boolean bomb, global_game_variables_t *gvar);\r
 //void MM_GetNewBlock(mminfo_t *mm);\r
 //void MM_FreeBlock(mmblocktype *x, mminfo_t *mm);\r
-void   XMS_CALL(byte v, global_game_variables_t *gvar);\r
 \r
 //==========================================================================\r
 \r