From: sparky4 Date: Wed, 21 Sep 2016 00:12:36 +0000 (-0500) Subject: 16_pm ommitted due to crashing exmmtest.exe X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=013cc1475855427f52e2f1f4ec1d7969e0932b08;p=16.git 16_pm ommitted due to crashing exmmtest.exe --- diff --git a/DEBUG.16W b/DEBUG.16W index 8f3ffe4d..aa147ba2 100755 --- a/DEBUG.16W +++ b/DEBUG.16W @@ -1,12 +1,12 @@ -Seg:0 Size:7812 Owner:0x6568 -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0 -Seg:1e84 Size:256 Owner:0x5274 +Seg:0 Size:7842 Owner:0x3370 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0 +Seg:1ea2 Size:256 Owner:0x52e8 ++++ -Seg:1f84 Size:273 Owner:0x92cc -+++++ -Seg:2513 Size:44 Owner:0x0 +Seg:1fa2 Size:273 Owner:0x9340 +++++ +Seg:252a Size:44 Owner:0x0 ++0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Seg:b53f Size:10945 Owner:0x0 -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +Seg:b556 Size:10922 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Seg:e000 Size:8191 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W index d873f507..319ef79a 100755 --- a/HEAP.16W +++ b/HEAP.16W @@ -1,47 +1,47 @@ == default == - USED block at 25350016 of size 66 - USED block at 25350058 of size 66 - FREE block at 2535009a of size 18 - USED block at 253500ac of size 136 - USED block at 25350134 of size 20 - FREE block at 25350148 of size 7860 + USED block at 254c0016 of size 66 + USED block at 254c0058 of size 66 + FREE block at 254c009a of size 18 + USED block at 254c00ac of size 136 + USED block at 254c0134 of size 20 + FREE block at 254c0148 of size 7860 OK - end of heap == near == - USED block at 15349306 of size 12 - USED block at 15349312 of size 332 - USED block at 1534945e of size 52 - USED block at 15349492 of size 20 - USED block at 153494a6 of size 20 - USED block at 153494ba of size 20 - USED block at 153494ce of size 20 - USED block at 153494e2 of size 20 - USED block at 153494f6 of size 27398 + USED block at 154b9376 of size 12 + USED block at 154b9382 of size 332 + USED block at 154b94ce of size 52 + USED block at 154b9502 of size 20 + USED block at 154b9516 of size 20 + USED block at 154b952a of size 20 + USED block at 154b953e of size 20 + USED block at 154b9552 of size 20 + USED block at 154b9566 of size 27286 OK - end of heap == far == - USED block at 25350016 of size 66 - USED block at 25350058 of size 66 - USED block at 2535009a of size 18 - USED block at 253500ac of size 136 - USED block at 25350134 of size 20 - USED block at 25350148 of size 7860 + USED block at 254c0016 of size 66 + USED block at 254c0058 of size 66 + USED block at 254c009a of size 18 + USED block at 254c00ac of size 136 + USED block at 254c0134 of size 20 + USED block at 254c0148 of size 7860 OK - end of heap Memory Type Total Used Free ---------------- -------- -------- -------- Default 8166 288 7878 -Near 27894 496 27398 +Near 27782 496 27286 Far 8166 288 7878 ---------------- -------- -------- -------- -coreleft = 27396 -farcoreleft = 2352 +coreleft = 27284 +farcoreleft = 2240 GetFreeSize = 40512 -GetNearFreeSize = 27398 +GetNearFreeSize = 27286 GetFarFreeSize = 40512 -memavl = 27396 -stackavail = 11792 +memavl = 27284 +stackavail = 11272 diff --git a/MEMINFO.16W b/MEMINFO.16W new file mode 100755 index 00000000..e69de29b diff --git a/MMDUMP.16W b/MMDUMP.16W index 0270a6db..2c53e9f0 100755 Binary files a/MMDUMP.16W and b/MMDUMP.16W differ diff --git a/makefile b/makefile index e150bce8..578670e0 100755 --- a/makefile +++ b/makefile @@ -91,7 +91,7 @@ UPXQ=-qqq S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#54096#60000 Z_FLAGS=-zk0 -zc -zp8 -zm O_FLAGS=-obmilr -oe=24 -out -oh -ei -onac -ol+ -ok##x -T_FLAGS=-bt=dos -mh -0 -fpi87 -fo=.$(OBJ) -d1 -e=65536 +T_FLAGS=-bt=dos -mh -0 -fpi87 -fo=.$(OBJ) -d1###### -e=65536 CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 !ifeq DEBUGSERIAL 1 @@ -106,7 +106,7 @@ LIBFLAGS=$(WLIBQ) -b -n # objects # VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ) -16LIBOBJS = 16_lib.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(OBJ) 16_pm.$(OBJ) +16LIBOBJS = 16_lib.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(OBJ)#### 16_pm.$(OBJ) GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ) #scroll16.$(OBJ) #16planar.$(OBJ) planar.$(OBJ) DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ) diff --git a/src/lib/16_lib.c b/src/lib/16_lib.c index 46489c70..57a06217 100755 --- a/src/lib/16_lib.c +++ b/src/lib/16_lib.c @@ -90,7 +90,7 @@ void Quit (char *error) { movedata ((unsigned)screen,7,0xb800,0,7*160); //gotoxy (10,4); - puts(error); + fprintf(stderr, "%s\n", error); //gotoxy (1,8); exit(1); } diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index f2537685..6659d0e0 100755 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -250,7 +250,7 @@ End: gvar->mm.EMSpageframe=EMSpageframe; gvar->mm.EMSpagesmapped=EMSpagesmapped; gvar->mm.EMShandle=EMShandle; - gvar->pm.emm.EMSVer=EMSVer; + gvar->mm.EMSVer=EMSVer; return 0; } @@ -380,7 +380,7 @@ byte MM_MapXEMS(global_game_variables_t *gvar) int i; EMShandle=gvar->mm.EMShandle; - if(gvar->pm.emm.EMSVer<0x40) + if(gvar->mm.EMSVer<0x40) return 5; for (i=0;ipm.emm.EMSVer>>4,gvar->pm.emm.EMSVer&0x0F); + printf(" EMM v%x.%x available\n", gvar->pm.emm.EMSVer>>4,gvar->mm.EMSVer&0x0F); printf(" totalEMSpages: %u ", gvar->mm.totalEMSpages); printf("freeEMSpages: %u\n", gvar->mm.freeEMSpages); printf(" EMSpageframe: %x\n", gvar->mm.EMSpageframe); } diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h index a0203ca7..5aa4c8c3 100755 --- a/src/lib/typdefst.h +++ b/src/lib/typdefst.h @@ -171,7 +171,7 @@ typedef struct #endif //byte EMS_status; unsigned totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;//TODO: PM use - //unsigned int EMSVer; + unsigned int EMSVer; word numUMBs,UMBbase[MAXUMBS]; //dword numUMBs,UMBbase[MAXUMBS]; //huge mmblocktype huge mmblocks[MAXBLOCKS],huge *mmhead,huge *mmfree,huge *mmrover,huge *mmnew;