From: sparky4 Date: Mon, 20 Jul 2015 15:51:34 +0000 (-0500) Subject: stillworking on it! X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=8e02b48e481611a3c25091a3d88fbf2da7000478 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 d6f4bcd6..3bc10dcf 100644 Binary files a/16.exe and b/16.exe differ diff --git a/DEBUG.TXT b/DEBUG.TXT index 02fe2030..3a6e9de4 100644 --- a/DEBUG.TXT +++ b/DEBUG.TXT @@ -1,6 +1,3 @@ -Seg:0 Size:176016 Owner:0xfe -Seg:2af9 Size:4096 Owner:0xfb20 -Seg:2bf9 Size:31344 Owner:0x1c58 -Seg:3928 Size:990512 Owner:0xeb00 -Seg:390a Size:683872 Owner:0x4 -Seg:e000 Size:131056 Owner:0x5e8d +Seg:7e9 Size:577552 Owner:0x50fd + +MM_ShowMemory: Memory block order currupted! diff --git a/MMDUMP.TXT b/MMDUMP.TXT index 2f6b536a..e69de29b 100644 Binary files a/MMDUMP.TXT and b/MMDUMP.TXT differ diff --git a/exmmtest.exe b/exmmtest.exe index 6f85475c..efdddf81 100644 Binary files a/exmmtest.exe and b/exmmtest.exe differ diff --git a/fmemtest.exe b/fmemtest.exe index f74dc944..624bc60e 100644 Binary files a/fmemtest.exe and b/fmemtest.exe differ diff --git a/fontgfx.exe b/fontgfx.exe index 01ff581c..d182022a 100644 Binary files a/fontgfx.exe and b/fontgfx.exe differ diff --git a/fonttes0.exe b/fonttes0.exe index aab4b03e..14e72e35 100644 Binary files a/fonttes0.exe and b/fonttes0.exe differ diff --git a/fonttest.exe b/fonttest.exe index 2cc9c1d7..be48aee6 100644 Binary files a/fonttest.exe and b/fonttest.exe differ diff --git a/makefile b/makefile index 97679804..d0770dba 100644 --- 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 6f4abf7b..356698ef 100644 Binary files a/maptest.exe and b/maptest.exe differ diff --git a/palettec.exe b/palettec.exe index d45227a9..393babfd 100644 Binary files a/palettec.exe and b/palettec.exe differ diff --git a/pcxtest.exe b/pcxtest.exe index 5e012a41..89cf28cd 100644 Binary files a/pcxtest.exe and b/pcxtest.exe differ diff --git a/sountest.exe b/sountest.exe index ee68b76b..10eefab6 100644 Binary files a/sountest.exe and b/sountest.exe differ diff --git a/src/exmmtest.c b/src/exmmtest.c index 60509f35..bdc79991 100644 --- 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 229f44d0..53022eb4 100644 --- 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 cf313c17..794865c3 100644 --- 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 34c3a633..6fb52b99 100644 Binary files a/test.exe and b/test.exe differ diff --git a/test2.exe b/test2.exe index 4703a926..4433bb27 100644 Binary files a/test2.exe and b/test2.exe differ