fixed the show memory output well~

	modified:   exmmtest.exe
	modified:   makefile
	modified:   src/lib/16_mm.c

diff --git a/exmmtest.exe b/exmmtest.exe
index 70d36418892f869e3b6182dc6baa8bb6068d0d46..213fa3cc72398f663b3b37f446e3b3bb604c6fd9 100644 (file)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/makefile b/makefile
index 639a8529a15562959d50f97454fd42827c21c835..810ed020e7d1c10f6a58eec0de91ec00d0ef3b06 100644 (file)
--- a/makefile
+++ b/makefile
@@ -177,13 +177,14 @@ jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
 #
 clean: .symbolic
        @$(REMOVECOMMAND) *.$(OBJ)
-       @echo "" > 16.lib
-       @echo "" > gfx.lib
+       @$(REMOVECOMMAND) *.lib
+       @wlib -n 16.lib
+       @wlib -n  gfx.lib
 #      @$(REMOVECOMMAND) *.OBJ
 #      @$(REMOVECOMMAND) *.out
 #      @$(REMOVECOMMAND) *.OUT
-       @$(REMOVECOMMAND) makefi~1
-       @$(REMOVECOMMAND) makefile~
+#      @$(REMOVECOMMAND) makefi~1
+#      @$(REMOVECOMMAND) makefile~
        @$(REMOVECOMMAND) __WCL__.LNK
 #      @$(REMOVECOMMAND) *.smp
        @$(REMOVECOMMAND) *.SMP

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index f6477b4d7c6ec54d5805d2f0be42cbe42f71c805..f03d56a1ae306b95c0f91a333d4af7830f07ec1c 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -634,11 +634,11 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
                MML_SetupEMS(mm);                                       // allocate space
                printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");     //bug!
                //TODO: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT!
-               MML_UseSpace(mm->EMSpageframe,(mm->EMSpagesmapped)*0x4000lu, mm);
+               MML_UseSpace(mm->EMSpageframe,(/*++++mm->EMSpagesmapped++++*/4)*0x4000lu, mm);
 //printf("EMS3\n");
                MM_MapEMS(mm);                                  // map in used pages
 //printf("EMS4\n");
-               mmi->EMSmem = (mm->EMSpagesmapped)*0x4000lu;
+               mmi->EMSmem = (/*++++mm->EMSpagesmapped++++*/4)*0x4000lu;
        }
 
 //
@@ -1038,7 +1038,7 @@ void MM_ShowMemory(mminfo_t *mm)
        mmblocktype huge *scan;
        unsigned color,temp;//, i;
        long    end,owner;
-       char    scratch[80],str[10];
+       char    scratch[160],str[16];
 
 //**** VW_SetDefaultColors();
 //**** VW_SetLineWidth(40);
@@ -1062,8 +1062,7 @@ void MM_ShowMemory(mminfo_t *mm)
                        color = 12;             // red = locked
                if(scan->start<=end)
                {
-                       printf("scan->start=%d\n", scan->start);
-                       printf("MM_ShowMemory: Memory block order currupted!\n");
+                       printf("\nMM_ShowMemory: Memory block order currupted!\n");
                        return;
                }
                end = scan->start+scan->length-1;
@@ -1073,9 +1072,11 @@ void MM_ShowMemory(mminfo_t *mm)
 //++++                 VW_Hlin(end+1,scan->next->start,0,0);   // black = free
 
 //****#if 0
-printf("Location:");
-printf("%x\t", scan->start);
-strcpy (scratch,"Size:");
+printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");    //bug!
+strcpy(scratch,"Location:");
+ultoa (scan->start,str,16);
+strcat (scratch,str);
+strcat (scratch,"\tSize:");
 ltoa ((dword)scan->length*16,str,10);
 strcat (scratch,str);
 strcat (scratch,"\tOwner:0x");