From cf3bed60e91dc628e3bb76aaae3f0f8222ac3c38 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 6 Jul 2015 12:37:09 -0500 Subject: [PATCH] fixed the show memory output well~ modified: exmmtest.exe modified: makefile modified: src/lib/16_mm.c --- exmmtest.exe | Bin 46170 -> 46219 bytes makefile | 9 +++++---- src/lib/16_mm.c | 17 +++++++++-------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/exmmtest.exe b/exmmtest.exe index 70d36418892f869e3b6182dc6baa8bb6068d0d46..213fa3cc72398f663b3b37f446e3b3bb604c6fd9 100644 GIT binary patch delta 14362 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 delta 14438 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 DgcszR diff --git a/makefile b/makefile index 639a8529..810ed020 100644 --- 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 f6477b4d..f03d56a1 100644 --- 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"); -- 2.39.5