From: sparky4 Date: Wed, 21 Sep 2016 02:11:10 +0000 (-0500) Subject: 16_pm is now in exmmtest.exe and major studying of how it behaves is needed to functi... X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=70fe32e01a3eeac5230aa562ab9b8062c6f3d30d 16_pm is now in exmmtest.exe and major studying of how it behaves is needed to function wwww --- diff --git a/DEBUG.16W b/DEBUG.16W index aa147ba2..443a5fd6 100755 --- a/DEBUG.16W +++ b/DEBUG.16W @@ -1,12 +1,12 @@ -Seg:0 Size:7842 Owner:0x3370 -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0 -Seg:1ea2 Size:256 Owner:0x52e8 -++++ -Seg:1fa2 Size:273 Owner:0x9340 -++++ -Seg:252a Size:44 Owner:0x0 -++0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Seg:b556 Size:10922 Owner:0x0 -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +Seg:0 Size:10392 Owner:0x7cfc +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0 +Seg:2898 Size:256 Owner:0x638e ++++++ +Seg:2998 Size:401 Owner:0xa41a +++++++ +Seg:2e11 Size:36 Owner:0x0 ++000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Seg:be35 Size:8651 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Seg:e000 Size:8191 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W index 319ef79a..11a19e83 100755 --- a/HEAP.16W +++ b/HEAP.16W @@ -1,47 +1,71 @@ == default == - 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 + FREE block at 2e330016 of size 18 + USED block at 2e330028 of size 136 + USED block at 2e3300b0 of size 50 + USED block at 2e3300e2 of size 50 + USED block at 2e330114 of size 50 + USED block at 2e330146 of size 50 + USED block at 2e330178 of size 50 + USED block at 2e3301aa of size 50 + USED block at 2e3301dc of size 50 + USED block at 2e33020e of size 50 + USED block at 2e330240 of size 50 + USED block at 2e330272 of size 50 + USED block at 2e3302a4 of size 50 + USED block at 2e3302d6 of size 50 + USED block at 2e330308 of size 50 + FREE block at 2e33033a of size 14 + USED block at 2e330348 of size 20 + FREE block at 2e33035c of size 7328 OK - end of heap == near == - 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 + USED block at 1e32a466 of size 12 + USED block at 1e32a472 of size 330 + USED block at 1e32a5bc of size 52 + USED block at 1e32a5f0 of size 20 + USED block at 1e32a604 of size 20 + USED block at 1e32a618 of size 20 + USED block at 1e32a62c of size 20 + USED block at 1e32a640 of size 20 + USED block at 1e32a654 of size 22952 OK - end of heap == far == - 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 + USED block at 2e330016 of size 18 + USED block at 2e330028 of size 136 + USED block at 2e3300b0 of size 50 + USED block at 2e3300e2 of size 50 + USED block at 2e330114 of size 50 + USED block at 2e330146 of size 50 + USED block at 2e330178 of size 50 + USED block at 2e3301aa of size 50 + USED block at 2e3301dc of size 50 + USED block at 2e33020e of size 50 + USED block at 2e330240 of size 50 + USED block at 2e330272 of size 50 + USED block at 2e3302a4 of size 50 + USED block at 2e3302d6 of size 50 + USED block at 2e330308 of size 50 + USED block at 2e33033a of size 14 + USED block at 2e330348 of size 20 + USED block at 2e33035c of size 7328 OK - end of heap Memory Type Total Used Free ---------------- -------- -------- -------- -Default 8166 288 7878 -Near 27782 496 27286 -Far 8166 288 7878 +Default 8166 806 7360 +Near 23446 494 22952 +Far 8166 806 7360 ---------------- -------- -------- -------- -coreleft = 27284 -farcoreleft = 2240 -GetFreeSize = 40512 -GetNearFreeSize = 27286 -GetFarFreeSize = 40512 -memavl = 27284 -stackavail = 11272 +coreleft = 22950 +farcoreleft = 21944 +GetFreeSize = 64548 +GetNearFreeSize = 22952 +GetFarFreeSize = 64548 +memavl = 22950 +stackavail = 11203 diff --git a/MMDUMP.16W b/MMDUMP.16W index 2c53e9f0..300e3279 100755 Binary files a/MMDUMP.16W and b/MMDUMP.16W differ diff --git a/PROFILE.16W b/PROFILE.16W new file mode 100755 index 00000000..e69de29b diff --git a/makefile b/makefile index 578670e0..fc9da23a 100755 --- a/makefile +++ b/makefile @@ -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_pm.$(OBJ) 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/exmmtest.c b/src/exmmtest.c index ff8be1df..a40b9988 100755 --- a/src/exmmtest.c +++ b/src/exmmtest.c @@ -23,6 +23,7 @@ exmm test */ #include "src/lib/16_head.h" +#include "src/lib/16_pm.h" #include "src/lib/16_ca.h" #include "src/lib/16_mm.h" #include "src/lib/16_hc.h" @@ -96,8 +97,9 @@ main(int argc, char *argv[]) } // printf("main()=%Fp start MM\n", *argv[0]); MM_Startup(&gvar); - //PM_Startup(); - //PM_UnlockMainMem(); + PM_Startup(&gvar); + //++++PM_UnlockMainMem(&gvar); + PM_LockMainMem(&gvar); CA_Startup(&gvar); // printf(" done!\n"); PRINTBB; @@ -143,7 +145,7 @@ for(w=0;w<2;w++) } #endif MM_FreePtr(&bigbuffer, &gvar); - //PM_Shutdown(); + PM_Shutdown(&gvar); CA_Shutdown(&gvar); MM_Shutdown(&gvar); free(bakapee1); free(bakapee2); diff --git a/src/lib/.16_pm.c.kate-swp b/src/lib/.16_pm.c.kate-swp new file mode 100755 index 00000000..16c820b2 Binary files /dev/null and b/src/lib/.16_pm.c.kate-swp differ diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index 6659d0e0..9eb93c67 100755 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -1605,7 +1605,7 @@ void MM_Report_(global_game_variables_t *gvar) if(MML_CheckForEMS()) { printf(" LIMEMS\n"); - printf(" EMM v%x.%x available\n", gvar->pm.emm.EMSVer>>4,gvar->mm.EMSVer&0x0F); + printf(" EMM v%x.%x available\n", gvar->mm.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); }