From 452bdcbb38b63efd36bd68f795dbc31114c4c423 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Tue, 21 Jul 2015 13:18:57 -0500 Subject: [PATCH] ==major fixings!==made major changes to the 16_mm and compilation stuff so that way the near segment has more space for the bloody memory management stuff! ^^ modified: 16.exe modified: DEBUG.TXT modified: MMDUMP.TXT modified: exmmtest.exe modified: fmemtest.exe modified: fontgfx.exe modified: fonttest.exe modified: inputest.exe modified: makefile modified: maptest.exe modified: palettec.exe modified: pcxtest.exe modified: sountest.exe modified: src/exmmtest.c modified: src/lib/16_mm.h modified: test.exe modified: test2.exe modified: tsthimem.exe --- 16.exe | Bin 30020 -> 30020 bytes DEBUG.TXT | 7 +++++++ MMDUMP.TXT | 5 ----- exmmtest.exe | Bin 40354 -> 40354 bytes fmemtest.exe | Bin 12556 -> 12556 bytes fontgfx.exe | Bin 25746 -> 25746 bytes fonttest.exe | Bin 13612 -> 13612 bytes inputest.exe | Bin 22688 -> 22688 bytes makefile | 2 +- maptest.exe | Bin 30140 -> 30140 bytes palettec.exe | Bin 23542 -> 23542 bytes pcxtest.exe | Bin 45546 -> 45546 bytes sountest.exe | Bin 39808 -> 39808 bytes src/exmmtest.c | 8 +++++++- src/lib/16_mm.h | 6 +++--- test.exe | Bin 23830 -> 23830 bytes test2.exe | Bin 25666 -> 25666 bytes tsthimem.exe | Bin 19456 -> 19456 bytes 18 files changed, 18 insertions(+), 10 deletions(-) diff --git a/16.exe b/16.exe index bcf171f84974523681a2effa09a236b731e485e6..7f8f0d89126ce08bf86efaefae4566b0e44d3428 100644 GIT binary patch delta 29 lcmX@|it)%RMj_uQ7e;G_2MksW>sbE(Kf%u6uu;gU6acIC3flkx delta 29 lcmX@|it)%RMj_uQ7e;G_2MksWdW`@7pI~R;*eGOF3IL?N3LpRg diff --git a/DEBUG.TXT b/DEBUG.TXT index e69de29b..3330ac44 100644 --- a/DEBUG.TXT +++ b/DEBUG.TXT @@ -0,0 +1,7 @@ +Seg:0 Size:113936 Owner:0x37e +Seg:1e1b Size:40768 Owner:0xab4 +Seg:280f Size:16384 Owner:0x32e2 +Seg:3259 Size:711280 Owner:0x468b +Seg:e000 Size:31344 Owner:0x5aa8 + +MM_ShowMemory: Memory block order currupted! diff --git a/MMDUMP.TXT b/MMDUMP.TXT index 06b0ee85..e69de29b 100644 --- a/MMDUMP.TXT +++ b/MMDUMP.TXT @@ -1,5 +0,0 @@ -0x004c:0a75 (P€) = 3009 -0x004c:120a (P) = 3009 -0x002d:21e6 (-ä) = 3009 -0x004c:c36b (PÍ) = 3009 -0x004c:fd76 (PÐ) = 3009 diff --git a/exmmtest.exe b/exmmtest.exe index 08892014ccb2c50a4560bd43ff401bc0f03db1fa..0f9724e999aa7464a6385173916390a582ffafe3 100644 GIT binary patch delta 1131 zcmZWoZAep57(RE-Z4C=jreRU$+>T#UH#DfwjO6w!8yE_G+#skQ75&Kyq7OsoIGnp1 za)uMRZEHk7goqfFuzuL5^g*G4Ec+q&r>jX=4OtXh@3}e)`*q&?zR&wU&w1W+V+lhn zVJJLsI3^rKZ9)gSYs_X{R@C~Sa7TX8J4|LsduFs1X|kYveA(ZaWJmH_4W1;smA{W4 zv-w_rG@8nqJxO^oAWdogE^WdfPXxsIVtKM75cVXsFZH80EIjg#K1A|_SDw_K*m|EE z17cb$aRmB3$@qY2wzM>eiI}4PK};{Eh`2-^sgTGJe;BjC_IYy@J82|_*|l* z$q)A{ofuFF1JXS8Q;;keU##Bso$kPeb8gIsD1%7kT!tPhva^dUBExB-^ za`OgoT1r#N!i9s~wkn@)H*dOKRZlA)r7c3Oc~D>5pQ^*{VbwGX6GexU$34dYmI z&831McE2LxZzq2%Y^6U08s1wr(6QX@ke+F1EdI`+3C7fhMRRQ>-ewnTfgp9 zoxJhyvf*X$b;r-wR|-1l3J1mSGz{dK0ObRJb~ny|VbBi$k`jT0v+2489L(~M_`N3g zx_!fNl_BgKyI}N9cJESVXx|WIhCxjfC#;ABV_;M+sR=gzoT-_18I&0UPy$f4eUH6l a2-e_-wnJ9ZR^TL$;9HIi6Yj|X delta 1131 zcmZWoUr19?7(aK;Z4Q%EreR^`aX0@>UEIXhTubHllnso8tSbcdP|-_P5S4|_aX5E3 z^ay*gM$(fI5rY)ggZ-8Myl5b#1HqSWC1EvWQEYwZ<}B*zeE0i)-}n2S-*@hK+%z6H z6&*Y}E*wG~LKhN+OvYtLwg*Mcxy9!&St6b3DL>LxL3{UNXf(lka{Z=}1iO{n&X48X z06!#4Me9gHoeL}T`jAVXHL0^<`D2MX*A>1!lF&ajPTjEaC@}R9sj~rfPJiqecxDdE zDZSJg9vVr+hAqowWfCTGl7^Zwy_h8O8kzJ$B27X*%)&c9TK!n0(KgJkRpKTd2iq{& zMmkJX{;VnaAyy+tLw;;D%~qCK*26EA^;QY`Bh8pq;Wwg$5mFas zfES^-g!D~KR7tusB-Db*ku>E;#DiH$RkzU3&Q-OZf;kc34uM{n0b;YfGggE&S39!dtLkmpaHV={ z0XVIssAA*7!EQ%Q(6E~~-Ki-p_G9vvSfBr{uMc}&bFvY_5I6ynxJK|8U>3s=7Qb5wH0-Isjy`q{xFfIvW*_G1Fv3e))f1H_=(yeNTd8hVQ?D8vDUgv z`4V=&B=S#@zZEuJS7G(?b%O5qb!Y5=m(!y0YL3-kE#-7;bP&|ZskjBvL8w0h=xY5Q zrIWd$_v2WL9llWrU9N^c5S!79B5!sSG~cJ{LQiU zH^;JT4>mZ)fPR4wbT8^DCuc~~PEfTz!`EOii~$3r2%y>Nh7E?B4Zb}7Yy32>JKvxd z{#iD>48HEz`NnF&0A1mr*xjb#91Ea=;Ll!Z2@HdF_?NUOB*fkQHgGV*KVtWGyYt#T zaFrGuoW5WV&h>e;B|6vw84sxO(KawDo74pdf6mlOyG_~>0Vn||+p!Oqw!j)f X(015PI`Ty_3EyhegJV7W4k*6>k7K;l diff --git a/fmemtest.exe b/fmemtest.exe index 2a7db548763f8a8bb38e73e440e6aae7b889fa76..dd4e540bbaa97b51da673f0b433a56afb60b5c9a 100644 GIT binary patch delta 27 icmeB4>PZsvjpAXHWGG^gXAoie|DTna!C|A&F9QH&hzFPe delta 27 icmeB4>PZsvjpAXHWGG^gXPCn9|351;1II?8Uj_hbL}T28WG8Ql+JUq)Y*I?FYXA diff --git a/inputest.exe b/inputest.exe index b20e87ca9d155c63b454ded787f90e401163d739..8573f4ea29dcc5b6af9b8746c57f1914a31f4e7b 100644 GIT binary patch delta 29 lcmZ3mk#WIBMj_v*1q`|j1&nbFiY)*C`?4}PY!vE?0057!30MFC delta 29 lcmZ3mk#WIBMj_v*1q`|j1&nbF3mN|Z_hn_^*eKK&0RWV037h}` diff --git a/makefile b/makefile index 5d5f4abc..2d922640 100644 --- a/makefile +++ b/makefile @@ -13,7 +13,7 @@ TARGET_OS = dos #-zkl = current codepage DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1# -zm -CFLAGS=-zk0 -wo -x -mc -zu #-k32768#-k16384# -zdp# -zp16 -zq +CFLAGS=-zk0 -wo -x -mc -zu -k16384# -zdp# -zp16 -zq OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+ FLAGS=-0 -lr $(OFLAGS) $(CFLAGS) $(DFLAGS) #-d2 SRC=src$(DIRSEP) diff --git a/maptest.exe b/maptest.exe index 8c098e4224bcea202571b38535f6cf9600836aeb..32f04da93f27ca799e38bd647c3d9055f75e387d 100644 GIT binary patch delta 29 lcmdnQ}$U&qbBu~F#8MgYCN3>yFd diff --git a/sountest.exe b/sountest.exe index 3e85c76ea34687d9db06f889a25570d771bf6852..40807e63f8fdff9704797a0645ae20a7e108d290 100644 GIT binary patch delta 29 lcmZqJ&eX7-Nys;?JFw6h{3pp7aHVWm<1^|-d3K0MR delta 29 lcmZqJ&eX7-Nys;@!WrqL%7jiOiY!u3y4FH#)3RM6A diff --git a/src/exmmtest.c b/src/exmmtest.c index f07fcf36..e77f7714 100644 --- a/src/exmmtest.c +++ b/src/exmmtest.c @@ -26,6 +26,8 @@ #include "src/lib/16_mm.h" #include "src/lib/modex16.h" +#define FILERL + void main(int argc, char *argv[]) { @@ -43,7 +45,7 @@ main(int argc, char *argv[]) if(argv[1]) bakapee = argv[1]; else bakapee = "data/koishi~~.pcx"; //if(argv[2]) - // #define FILEINIT + //#define FILEINIT textInit(); @@ -56,6 +58,7 @@ main(int argc, char *argv[]) MM_Startup(&mm, &mmi); printf(" done!\n"); printf("&main()=%Fp\n", *argv[0]); +#ifdef FILERL #ifdef FILEINIT printf(" read\n"); if(CA_ReadFile(bakapee, &bigbuffer, &mm/*, &mmi*/)) @@ -66,6 +69,7 @@ main(int argc, char *argv[]) baka=1; else baka=0; +#endif //MM_GetPtr(&bigbuffer, mmi.nearheap, &mm, &mmi); //hmm functions in cache system use the buffered stuff printf("size of big buffer~=%u\n", _bmsize(segu, bigbuffer)); @@ -84,8 +88,10 @@ main(int argc, char *argv[]) MM_FreePtr(&bigbuffer, &mm); MM_Shutdown(&mm); printf(" done!\n"); +#ifdef FILERL free(bakapee); //printf("_bios_memsize=%u\n", _bios_memsize()); if(baka) printf("\nyay!\n"); else printf("\npoo!\n"); +#endif } diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h index 68999521..7bf582af 100644 --- a/src/lib/16_mm.h +++ b/src/lib/16_mm.h @@ -36,12 +36,12 @@ #endif -#define SAVENEARHEAP 0x200 // space to leave in data segment +#define SAVENEARHEAP 0x8000 // space to leave in data segment #define SAVEFARHEAP 0 // space to leave in far heap -#define BUFFERSIZE 0x1000 // miscelanious, allways available buffer +#define BUFFERSIZE 0x4000 // miscelanious, allways available buffer -#define MAXBLOCKS 640 +#define MAXBLOCKS 720 diff --git a/test.exe b/test.exe index 424e96f77d99361b106cd13155086c9ebd6437e3..f6977eb1648d4d26cd8bd1a17cccc62426040180 100644 GIT binary patch delta 29 lcmbQXi*ed6Mj_uQF-Coc4Gek=OIZH@cV}a8*eJvj3jm7|2-g4r delta 29 lcmbQXi*ed6Mj_uQF-Coc4Gek=DvbaCyR$KHY!qUN1ptHC2pj+a diff --git a/test2.exe b/test2.exe index bca481f47440f9ddb5fa9d6fd78c5cc00853ee7b..ba76d6b50abbcfde6d9649d6a6381f815274c294 100644 GIT binary patch delta 29 lcmX?fg7MG^Mj_uQCkA7Ny$nVSYgqpO-^a$_uu;e$1puIr3OxV- delta 29 lcmX?fg7MG^Mj_uQCkA7Ny$nVSI*kAS?_*=&*eGO>0sxs-34#Cs diff --git a/tsthimem.exe b/tsthimem.exe index 19118cf62f27103cb5b021778bc3e2ade0e4449b..e9b1e3804586f02c4654bf8af78c3c82479e1f17 100644 GIT binary patch delta 29 lcmZpe!Pqc^QOGxnfkBPoA%iu85X=An(^(iCHVVD-1^|8n2^jzY delta 29 lcmZpe!Pqc^QOGxnfkBPoA%iu;B!>V0r?W6{Y!rIu4FH0^30(jH -- 2.39.2