stillworking on it!

	modified:   16.exe
	modified:   DEBUG.TXT
	modified:   MMDUMP.TXT
	modified:   exmmtest.exe
	modified:   fmemtest.exe
	modified:   fontgfx.exe
	modified:   fonttes0.exe
	modified:   fonttest.exe
	modified:   makefile
	modified:   maptest.exe
	modified:   palettec.exe
	modified:   pcxtest.exe
	modified:   sountest.exe
	modified:   src/exmmtest.c
	modified:   src/lib/16_mm.c
	modified:   src/lib/16_mm.h
	modified:   test.exe
	modified:   test2.exe

diff --git a/16.exe b/16.exe
index d6f4bcd601510279380ea2db547dd7a3963d46ed..3bc10dcf6093ca0896fe16deb61f81fd74437f42 100644 (file)
Binary files a/16.exe and b/16.exe differ

diff --git a/DEBUG.TXT b/DEBUG.TXT
index 02fe203093184bf40d33ed01058832d677a70575..3a6e9de4e0bd3c6dfb84336efd7eab06523c65c8 100644 (file)
--- a/DEBUG.TXT
+++ b/DEBUG.TXT
@@ -1,6 +1,3 @@
-Seg:0  Size:176016     Owner:0xfe\r
-Seg:2af9       Size:4096       Owner:0xfb20\r
-Seg:2bf9       Size:31344      Owner:0x1c58\r
-Seg:3928       Size:990512     Owner:0xeb00\r
-Seg:390a       Size:683872     Owner:0x4\r
-Seg:e000       Size:131056     Owner:0x5e8d\r
+Seg:7e9        Size:577552     Owner:0x50fd\r
+\r
+MM_ShowMemory: Memory block order currupted!\r

diff --git a/MMDUMP.TXT b/MMDUMP.TXT
index 2f6b536afb3338e42999f1b0294aae595a7a7226..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
Binary files a/MMDUMP.TXT and b/MMDUMP.TXT differ

diff --git a/exmmtest.exe b/exmmtest.exe
index 6f85475cd087545e116f0693ca69fa8a40d14531..efdddf817120335263a868fc5d5552239c2abfa1 100644 (file)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/fmemtest.exe b/fmemtest.exe
index f74dc944a130bb5cb4235dc1bbcfc31b405efef1..624bc60e3c0778ebfc955ae0e52d32f11e85b1b7 100644 (file)
Binary files a/fmemtest.exe and b/fmemtest.exe differ

diff --git a/fontgfx.exe b/fontgfx.exe
index 01ff581c0327402a47e6ce3c644c824a77bf7ba8..d182022a808c6bbbc061602b8a3ca1a7b2098238 100644 (file)
Binary files a/fontgfx.exe and b/fontgfx.exe differ

diff --git a/fonttes0.exe b/fonttes0.exe
index aab4b03eddbebabb5c376f9bd644a31a2d826111..14e72e35180f48ed6e82d6b5bd5b03f93c2c0187 100644 (file)
Binary files a/fonttes0.exe and b/fonttes0.exe differ

diff --git a/fonttest.exe b/fonttest.exe
index 2cc9c1d75c120bf84c842769edbe8ab4f869bcd0..be48aee686d85a3d55fe4b4d8a7b972b5cbe9098 100644 (file)
Binary files a/fonttest.exe and b/fonttest.exe differ

diff --git a/makefile b/makefile
index 97679804295e489ad9121093c259e6b8dca04248..d0770dbae5e7828a9ff826b830f95508cde45509 100644 (file)
--- a/makefile
+++ b/makefile
@@ -28,7 +28,8 @@ DOSLIBOBJ = adlib.$(OBJ) midi.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OB
 16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16_ca.$(OBJ)
 GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ)
 
-all: 16.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe exmmtest.exe fonttes0.exe fontgfx.exe sountest.exe miditest.exe testemm.exe tsthimem.exe inputest.exe testemm0.exe
+all: 16.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe exmmtest.exe fonttes0.exe fontgfx.exe sountest.exe miditest.exe tsthimem.exe inputest.exe
+#testemm.exe testemm0.exe
 
 #
 #executables

diff --git a/maptest.exe b/maptest.exe
index 6f4abf7b07386546c32640a1ddc5bdd7d795b88b..356698ef42edaa10334e8def4d80b8fea1190076 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/palettec.exe b/palettec.exe
index d45227a986d28e0a7c9d05d16dddde30c4df9c70..393babfde024678779544ec09f7f5dd1b204d858 100644 (file)
Binary files a/palettec.exe and b/palettec.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index 5e012a4183f1e4a45cbec623cf966f4096f3acc2..89cf28cd7b077ad76a1b63795e2cfb0ed2b6ae98 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/sountest.exe b/sountest.exe
index ee68b76bdb5d04c6446d90975a9fd5081430db44..10eefab6aa47af06c9b09462ad163a2dddbb5110 100644 (file)
Binary files a/sountest.exe and b/sountest.exe differ

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 60509f3519c3b0609bdd78c019f38f9a0c7cf313..bdc799915c4cdd4e36c9a03783868b117956ae48 100644 (file)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -67,10 +67,10 @@ main(int argc, char *argv[])
        modexEnter();
        modexShowPage(&screen);
        MM_ShowMemory(&screen, &mm);
-       MM_DumpData(&mm);
        getch();
-       MM_Report(&screen, &mm, &mmi);
+       MM_DumpData(&mm);
        modexLeave();
+       MM_Report(&screen, &mm, &mmi);
        printf("stop!\n");
        MM_FreePtr(&bigbuffer, &mm);
        MM_Shutdown(&mm);

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 229f44d0551a4aba7c7bd0f125cb39674820bd12..53022eb4adcbb006c524f6505e7d63545f1c8159 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -143,7 +143,7 @@ unsigned MML_SetupEMS(mminfo_t *mm)
        union REGS CPURegs;
 
        unsigned int EMSVer = 0;
-       byte    EMS_status;
+       byte    EMSstatus;
        unsigned        totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
        totalEMSpages = freeEMSpages = EMSpageframe = EMSpagesmapped = 0;
 
@@ -152,7 +152,7 @@ unsigned MML_SetupEMS(mminfo_t *mm)
                mov     ah,EMS_STATUS
                int     EMS_INT                                         // make sure EMS hardware is present
                or      ah,ah
-               mov     [EMS_status],ah
+               //mov   [EMSstatus],ah
                jnz     error
 
                mov     ah,EMS_VERSION
@@ -219,6 +219,7 @@ End:
        mm->EMSpagesmapped=EMSpagesmapped;
        mm->EMShandle=EMShandle;
        mm->EMSVer=EMSVer;
+       //mm->EMSstatus=EMSstatus;
        return 0;
 }
 
@@ -1315,11 +1316,12 @@ dword MM_TotalFree(mminfo_t *mm)
 
 void MM_Report(page_t *page, mminfo_t *mm, mminfotype *mmi)
 {
+       printf("\n");
        if(MML_CheckForEMS())
        {
-               printf("EMM v%x.%x available\n", mm->EMSVer>>4,mm->EMSVer&0x0F);
+               printf("Expanded memory manager present. EMM v%x.%x available\n", mm->EMSVer>>4,mm->EMSVer&0x0F);
                printf("totalEMSpages=%u\n", mm->totalEMSpages);
-               printf("freeEMSpages=%u\n", mm->freeEMSpages);
+               printf("Page frame @0x%04x\n", mm->freeEMSpages);
                printf("EMSpageframe=%x\n", mm->EMSpageframe);
        }
        if(MML_CheckForXMS(mm)) printf("XMSaddr=%Fp\n", *XMSaddr);

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index cf313c17e715a0d284bf9ce499ced1ef08a2255d..794865c35a207f580954f31121b6f0a3486ce7de 100644 (file)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -135,7 +135,7 @@ typedef struct
        boolean         mmstarted, bombonerror, mmerror;
        void huge       *farheap;
        void            *nearheap;
-       byte            EMS_status;
+       byte            EMSstatus;
        unsigned        totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
        unsigned int EMSVer;
        word numUMBs,UMBbase[MAXUMBS];

diff --git a/test.exe b/test.exe
index 34c3a63395ac989caa6ae856e3810e1d0d5f04b3..6fb52b99b442a8229daea97a7478a3f74d35a348 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 4703a92660a28d2442b54bb87bde96f15c4a29f2..4433bb27e60fb2c98134619d3c7ecf163440fa19 100644 (file)
Binary files a/test2.exe and b/test2.exe differ