From 7d8edad397490780675142538b54033e7e6fefb3 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Fri, 31 Jul 2015 17:30:36 -0500 Subject: [PATCH] I think the stack should be in it's own segment for stability reasons wwww modified: 16.exe deleted: DEBUG.16 deleted: MMDUMP.16 deleted: PROFILE.16 modified: bakapi.exe 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: scroll.exe modified: sega.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 modified: tsthimem.exe --- 16.exe | Bin 85627 -> 85627 bytes DEBUG.16 | 6 ------ MMDUMP.16 | Bin 114 -> 0 bytes PROFILE.16 | 0 bakapi.exe | Bin 56092 -> 56092 bytes exmmtest.exe | Bin 67683 -> 67686 bytes fmemtest.exe | Bin 22141 -> 22141 bytes fontgfx.exe | Bin 45720 -> 45720 bytes fonttest.exe | Bin 23858 -> 23858 bytes inputest.exe | Bin 55876 -> 55876 bytes makefile | 8 ++++---- maptest.exe | Bin 56414 -> 56414 bytes palettec.exe | Bin 42601 -> 42601 bytes pcxtest.exe | Bin 72356 -> 72356 bytes scroll.exe | Bin 126705 -> 126705 bytes sega.exe | Bin 22063 -> 22063 bytes sountest.exe | Bin 82254 -> 82254 bytes src/exmmtest.c | 8 -------- src/lib/16_mm.c | 1 + src/lib/16_mm.h | 2 +- test.exe | Bin 43054 -> 43054 bytes test2.exe | Bin 48232 -> 48232 bytes tsthimem.exe | Bin 38882 -> 38882 bytes 23 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 DEBUG.16 delete mode 100644 MMDUMP.16 delete mode 100644 PROFILE.16 diff --git a/16.exe b/16.exe index 85e6fc4ae5fc0fa882794d4e1b0875641794c6e9..f5913d9648687f5b329def2153329c3db12eb98d 100644 GIT binary patch delta 40 wcmex8hxPXyRw3W0Jcba4EXG)d6KwzgU*uv)XcXEi#P~ytF${jaHDt6*koYHZ5OWdM;eGc`5>$_RpF3?QOLDONx=AW;S+ ZQJ^X2W@%|a(HJCApju0#M3C7q69B3A7u^5= diff --git a/PROFILE.16 b/PROFILE.16 deleted file mode 100644 index e69de29b..00000000 diff --git a/bakapi.exe b/bakapi.exe index a30c1bb0fb9af5d62a7c945593c444ceedf189cb..4d5bb55649d0bf88ef1a9019fe3dab9c577c8e7a 100644 GIT binary patch delta 36 scmbQUjd{*CW+C6GXN>j?TNw-(ma+Z+AHuj?TNw-(mT~<5AHu=Vuu(|#C}YEBjiX;g0rk5Lz5oCK diff --git a/exmmtest.exe b/exmmtest.exe index 9147e6451cfd0ef725bd0944e310567212c6c2fa..b1754460141b684c0f153062a2ef5d080b3271a1 100644 GIT binary patch delta 1870 zcmZvbYj6`)6vyw~-6Spa5t`&~noZNRBq?cYp*jVf3Mw#RP{F7ed>~N7m4O0^4V}@N zf~9J@O|71yGKhn;l;Ws^Eb7h_MR{n8BSOaqGAj5$w+L8f5HXa-vxUy^!B6`?zw`K? zyLtj>EFM6gWL&=uC<-JO1P>Brbr=e7QjIM(= zv4Adu55$`)_7p{%n6?S`*>uL}FT=8KGl^fs0U7@IKBGCXrf3kEvhL>Vl(s3?>F2@c zoaO8E8QFj$29z0GWoR&Js*EISB1S*j8vW~h@S*61_npp)p96+XH`?quZP;9YjZN9` zpkbT(Yi$^Cxm9_)#-h!!CQH|v=mTAR&HYzSf);4-8m!3;(iQMlZUwy&PUJ492Vu5L zqVK{|mzO3$amf>;tcF;OM9mGcI#M%V3Dqf)7`hn8D>Nowu<+Nyf1p5`V*J{8 zw_8s&eo|wdn3_0m4Ab^v?ylk5K&L6Je-4Me zUfQXi^EO)O9H<>vK#ej0s*s&P zw#s1Y=Ji`BeN&zGYLZf3owDJxbS`3pn>*Z4*j_Gn$Z{_8f;?hr;T}fka18 zxZP30h9`a7QQ)}OQOM*$%(glP9P%X;XB`8Ou{F4;lpPfb*ILj+moLXdECX%@a9;?7 z$VvtwH?qT`+=Sv8_LeBmMX{ExWkik-t7cJNisBpgBcc~j{lXAEk3tZuMfo`tWnvk; zx^)77RIG=CTP4RIV$>y{!o*nTN|)S^qT0C%l3R=KUgLU6`u|1bOhTGmaY>$x;vLrx z7m*)Db;z|;k{?9zlglp251=qfCJ7f`jIvN#3enCo;bqC@hRn@{aALOw4tJ(!ye^G) z%U@%~X^DrEoyCIPef-)All8VNe9i9f-14m`9&vvKcW)~aPPj8Y;Mp?H+JR7aTRd_* zim7>1Vb``IKFjkE{IqRChTRkK%jwyKNcjabFc)D~z;gxGA!Gp&65Geq zHuah=cdyK3M!(S(mF{Y{iERC`aol1(?kxgi%kmAsRdLT_>- om*Al)nXA@c+E2%n`}mm1^9!bXd48Ig&ni*xx@;XSEUF>oKP)ZNAOHXW delta 1836 zcmZvbdu&tJ9mmhP_u9_Gaf~15I=;4JL+s!rB}rF6EstfRayGF_hN1+}fTc=rQD{(s zm~?GkU4Y`;IE4LxZmn1m31HT)qTFh`QwHU^657&{t!U!eu7GYbLZdw*NFeUd0VMwD zU;h3+zwhsH&ON@_Eqv20*q&Q1kcH$UQcChNQmLX$()OWky)dJKCARDx=p5)guU~OJ zkor@SW}u1R?Hyp9=cAni`Uq)1B_twa`gZlOaG9qstJ^YMls*s1%r9xP+LE=2qlbXc zDW!h(2RR(2IqED+DW$`zoO_q2|Ak-J`{}o8k;6*qt1!oT^r^Y0SDKZoo5i9M(WOc* zx|nG;KB{m1w*6EF(<=F>QkA8@hLI2-(Kp@GQYl@7GREjVh_FKX0jycbueu=&VP3}T|WbDeMS<$gAFWTafx&kLayg%5*l0qZc73DS@gr7T&|hlgwln5 zSa|$ay70-z3d;)OC(~0yZH2AaOxZN|31!FpCv+DGc{ScYPQ&cQ4pXu%wk*jvEPb#W z?usMdhF|4{=_~Ml-c0%o{41}Xeg;vugg5-M+fTPa!Y!A1E$uBWBxY=HX(A0Pl}M9P z)q+#f3r|gV9yRfg!@Dp|n(dkh4jQ>Z!adAzXje8i>A#2dQn~llK)UX2;`*=I>rx;5A)YUn~ybEXQgKSdsF@v>gUn9$V#4M>sGt-6<86P2Asu5SYE8u@(LLa$~{c!ZT z`-`JYGa4r0rH63NL>jsbQN90q*EKXMl~$$N##d(8tF!n@v%T7qHWZ>EIazXR#VU2& z-)y2)@XP4|`Ubo+J*Ha1SJ%)NVR*+hdJLxQEHr$)fe<6C+iZvEPAfePHOQ_YTc2j? zo}GIs?NJxJHAbmHo&VdvW^&KlVQ#MnruNLF3t?%`k9n&-0=s*r3rp;Ej>*)G9tT@x zuXV`(%Ob?&Fgb`kfy(3XL2hrDuX9wwoZflP4UYLvxjCDVLk_D`ZbD&kS|QOJ7JlLk zv&l{udIQcyPCt|HVYbV8+bNHuxaGVJ=6&H8ir58_aNU73w7wn>u?D!cz zX0dak+=1eCmK5b`6s@e45jj4oIz+h+#oyT_L|ajP#Sp!Tf)ndRc?*gXu>{`QSH@ou zo8jy}$$3NE;FgCl5pdPJob{gDN)+4H4Gu0T=a`5YDvh zf#c{t75qO8C(HRW!T&(uV8}We%nqfi#Cv8AExiCq3fanf94N%P}-*U5ADjO?*bin!)s$dPx# delta 36 scmeynhVkzjMj_uQ9|kFg90pki5sv@=rI{HTHVP&9Fg9#1_Tl0J0N(ctD*ylh diff --git a/fontgfx.exe b/fontgfx.exe index bf8a3afa9ad57c45357918957cc01ba562e56929..882b21c0bb837de5ef116f479818348cb233d42d 100644 GIT binary patch delta 36 scmbR7lxfCOCL!M_CPpKM2@Gls%h>+^-@wL@uu;fqK4Ze>(D}~70Oe#1WdHyG delta 36 scmbR7lxfCOCL!M_CPpKM2@Gls%Q*i3-@wMuuu;fqK4Zh?(D}~70O!aIrvLx| diff --git a/fonttest.exe b/fonttest.exe index 4de46206fe35baf05e1a4f725b59a171a2b19183..cd586412f9cdf1c3c256b3566014332eeef3f49d 100644 GIT binary patch delta 36 scmdnAi*eH~Mj_v*KMc|gxeRg)qHO>FyD>8)Y!vbhWK7tc5O|3j0OCXo`v3p{ delta 36 scmdnAi*eH~Mj_v*KMc|gxeRg)q8$JKyD>8~Y!vbhWNg@+5O|3j0OY6)Jpcdz diff --git a/inputest.exe b/inputest.exe index c80839602041cbebf3ed6bc62a68962dabf1a78f..d05fecfbd243f35b56c8c286db892c90ae31e949 100644 GIT binary patch delta 36 scmX@Ih55)9W+C4w0Y)o^2*wBoZMOgaS=bp8HVQ32z?iUk*MTlc0NN1@p#T5? delta 36 scmX@Ih55)9W+C4w0Y)o^2*wBoZI1u{S=bpGHVQ32z}T>P*MTlc0Niy9;{X5v diff --git a/makefile b/makefile index 554aa3f8..c0713ebc 100644 --- a/makefile +++ b/makefile @@ -22,11 +22,11 @@ WCPULIB=$(SRCLIB)wcpu$(DIRSEP) 16FLAGS=-fh=16.hed BAKAPIFLAGS=-fh=bakapi.hed - -SFLAGS=-k32768#51200#49152 +#-st -zu +SFLAGS=-k24576#32768#51200#49152 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS) -ZFLAGS=-zk0 -zq# -zu -zm# -zc# -zdp# -zp16 -zq -CFLAGS=-mc -ei -wo -x# -r +ZFLAGS=-zk0 -zq# -zu# -zm# -zc# -zdp# -zp16 -zq +CFLAGS=-mc -ei -wo -x OFLAGS=-otexanbhrml -ol+ FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS) $(DFLAGS) $(ZFLAGS) diff --git a/maptest.exe b/maptest.exe index 2b70d8315da09a1f5636209c15c34027884691e9..713e2bd9674f3bf31ce3fd714e87662442c84d09 100644 GIT binary patch delta 36 ucmV+<0NelGxC7p}0}@SI90582kpL$EuLl4Bxd#AXu@Zp80bsL}!^;@=bq*l_ delta 36 ucmV+<0NelGxC7p}0}@SI90582kpL$EuL%GDxd#A%u@Zp80f4iU!^;@?*$!g> diff --git a/palettec.exe b/palettec.exe index 7f2d270803614f8f8386b42b11c3bba57be72749..87b8b72fc2bf9239359b3d5e9c09e03fbab40779 100644 GIT binary patch delta 36 scmaEPhUw)QCL!ObV+?u>oeZiBOW6MZ*Jfi#*eLX5GGoH#?~{v!00>tOUjP6A delta 36 scmaEPhUw)QCL!ObV+?u>oeZiBOE~`j*JfjA*eLX5GGoK$?~{v!01CSfp#T5? diff --git a/pcxtest.exe b/pcxtest.exe index 491a9cff2803ee2c2abe4e7be5cce327aad47e69..34b854b19124ad5a0cbb8cc6727ca710de6bccf1 100644 GIT binary patch delta 40 ycmV+@0N4MdwFIQK1QJbJ+5uPqs{kzk%?AJfoeKb9ffBV60kr`EV7JHt0o)ia&kjET delta 40 ycmV+@0N4MdwFIQK1QJbJ+5uPqs{kzk%?SVhoeKbfffBV60kr`EfVap20o)id+YW&M diff --git a/scroll.exe b/scroll.exe index 9d132349001cea6551dda5f2deb63eda27ce99f1..a8b51d6cc6abe4432a1f32708133110a496bf539 100644 GIT binary patch delta 40 wcmex(m;K{ib|K#=7ls~&UdA+r7i|CkKNDm~XcXEi#Av#oF=4yMe#Vvh08+ybvH$=8 delta 40 wcmex(m;K{ib|K#=7ls~&UdA+r7aafpKNDnVXcXEi#Av#ov0=N%e#Vvh09DTq^Z)<= diff --git a/sega.exe b/sega.exe index f71de577db4e1ed077142e50d01f126460fa06e4..4e83099ebe2a54ef940d9289f5b36d335cbf3f25 100644 GIT binary patch delta 36 scmZ3#hH?EGMj_v*LyVFPISjH4!fgNl3o$b!Y!p)SVNBR;>GO>f0MbhfFaQ7m delta 36 scmZ3#hH?EGMj_v*LyVFPISjH4!W{qq3o$b^Y!p)SVQkoJ>GO>f0MxGwasU7T diff --git a/sountest.exe b/sountest.exe index db2fbe052dbc600e648524c5faa8bd1e4df79b3a..52d3e132c01811c19f302bf1e22c2a7721d7e710 100644 GIT binary patch delta 40 wcmX@t#CooYRme9=fH9gOgE597mhJ!lAZ~_)Mxm`jj9rS13ESr?GH#Ry00DIjU;qFB delta 40 wcmX@t#CooYRme9=fH9gOgE597mgE2bAZ~_+Mxm`jj9rS14cq4`GH#Ry00e;yq5uE@ diff --git a/src/exmmtest.c b/src/exmmtest.c index a84d2327..a1457aae 100644 --- a/src/exmmtest.c +++ b/src/exmmtest.c @@ -80,14 +80,6 @@ main(int argc, char *argv[]) //PM_UnlockMainMem(); CA_Startup(); printf(" done!\n"); - /*if(FP_SEG(*argv[0])==0) - { - MM_Report(&screen, &mm, &mmi); - MM_Shutdown(&mm); - printf("&main()=%Fp\n", *argv[0]); - printf("&main() == %u\n", FP_SEG(*argv[0])); - exit(-5); - }*/ printf("&main()= %Fp\n", *argv[0]); printf("bigbuffer= %Fp\n", bigbuffer); printf("&bigbuffer= %Fp\n", &bigbuffer); diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index 701db3e8..764ecfe9 100644 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -887,6 +887,7 @@ void MM_GetPtr(memptr *baseptr,dword size, mminfo_t *mm, mminfotype *mmi) if (mm->bombonerror) { + heapdump(); printf(OUT_OF_MEM_MSG,(size-mmi->nearheap)); printf("for stability reasons the program will shut down! wwww\n"); MM_Shutdown(mm); diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h index 3b98e0ae..4298adb0 100644 --- a/src/lib/16_mm.h +++ b/src/lib/16_mm.h @@ -36,7 +36,7 @@ #endif -#define SAVENEARHEAP 0//x200 // space to leave in data segment +#define SAVENEARHEAP 0//_memavl()/4 // space to leave in data segment #define SAVEFARHEAP 0//x400 // space to leave in far heap #define BUFFERSIZE 0x1000 // miscelanious, allways available buffer diff --git a/test.exe b/test.exe index 4b164a397a1f7b9904a90a73fb430624187f46f2..9ae0ae0753e783778ea8429e05b1aa63c5f35dfe 100644 GIT binary patch delta 36 scmZ2?foa_ZCL!ObZ;W~joeZiBOW6MZw_{^S*eFysl`&y+=hUS_0Q#B@kN^Mx delta 36 scmZ2?foa_ZCL!ObZ;W~joeZiBOE~`jw_{^y*eFysm9b%S=hUS_0Q~+9(f|Me diff --git a/test2.exe b/test2.exe index 17b2e157be90d5ccc77e085e027170b971b993d6..ce7a9848267db0a57fe59c6ed775052b73f44364 100644 GIT binary patch delta 36 ucmV+<0NelQ_yXwo0uoJHVgND#i2x-4tOo!8tp)&Ku@b?i0bsM#rj!*B^$z3! delta 36 ucmV+<0NelQ_yXwo0uoJHVgND#i2x-4tO)=Atp)&qu@b?i0f4jArj!*ESq~-v diff --git a/tsthimem.exe b/tsthimem.exe index 405febaa7b657108358ea7e8be18b9a62739dad1..d0d6fc9999a16991c3c01f5a3448523e0a073884 100644 GIT binary patch delta 40 wcmaE~p6StgCL!M_2SyEsN(My+A-4bjpRzC{Y!q^9WlWg7u}gS!PHUME03Ff}J^%m! delta 40 wcmaE~p6StgCL!M_2SyEsN(My+A&&q5pRzDCY!q^9Wo($du}gS!PHUME03kjOfB*mh -- 2.39.5