From: sparky4 Date: Fri, 31 Jul 2015 22:30:36 +0000 (-0500) Subject: I think the stack should be in it's own segment for stability reasons wwww X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=7d8edad397490780675142538b54033e7e6fefb3;p=16.git 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 --- diff --git a/16.exe b/16.exe index 85e6fc4a..f5913d96 100644 Binary files a/16.exe and b/16.exe differ diff --git a/DEBUG.16 b/DEBUG.16 deleted file mode 100644 index 8ad8653b..00000000 --- a/DEBUG.16 +++ /dev/null @@ -1,6 +0,0 @@ -Seg:0 Size:5212 Owner:0x76ff -Seg:145c Size:256 Owner:0x6552 -Seg:155c Size:273 Owner:0x92aa -Seg:1af9 Size:17 Owner:0x6532 -Seg:1cfa Size:49926 Owner:0x0 -Seg:e000 Size:4294909951 Owner:0x5bba diff --git a/MMDUMP.16 b/MMDUMP.16 deleted file mode 100644 index 5715b37a..00000000 Binary files a/MMDUMP.16 and /dev/null differ diff --git a/PROFILE.16 b/PROFILE.16 deleted file mode 100644 index e69de29b..00000000 diff --git a/bakapi.exe b/bakapi.exe index a30c1bb0..4d5bb556 100644 Binary files a/bakapi.exe and b/bakapi.exe differ diff --git a/exmmtest.exe b/exmmtest.exe index 9147e645..b1754460 100644 Binary files a/exmmtest.exe and b/exmmtest.exe differ diff --git a/fmemtest.exe b/fmemtest.exe index a5a7ab9a..41a8b191 100644 Binary files a/fmemtest.exe and b/fmemtest.exe differ diff --git a/fontgfx.exe b/fontgfx.exe index bf8a3afa..882b21c0 100644 Binary files a/fontgfx.exe and b/fontgfx.exe differ diff --git a/fonttest.exe b/fonttest.exe index 4de46206..cd586412 100644 Binary files a/fonttest.exe and b/fonttest.exe differ diff --git a/inputest.exe b/inputest.exe index c8083960..d05fecfb 100644 Binary files a/inputest.exe and b/inputest.exe differ 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 2b70d831..713e2bd9 100644 Binary files a/maptest.exe and b/maptest.exe differ diff --git a/palettec.exe b/palettec.exe index 7f2d2708..87b8b72f 100644 Binary files a/palettec.exe and b/palettec.exe differ diff --git a/pcxtest.exe b/pcxtest.exe index 491a9cff..34b854b1 100644 Binary files a/pcxtest.exe and b/pcxtest.exe differ diff --git a/scroll.exe b/scroll.exe index 9d132349..a8b51d6c 100644 Binary files a/scroll.exe and b/scroll.exe differ diff --git a/sega.exe b/sega.exe index f71de577..4e83099e 100644 Binary files a/sega.exe and b/sega.exe differ diff --git a/sountest.exe b/sountest.exe index db2fbe05..52d3e132 100644 Binary files a/sountest.exe and b/sountest.exe differ 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 4b164a39..9ae0ae07 100644 Binary files a/test.exe and b/test.exe differ diff --git a/test2.exe b/test2.exe index 17b2e157..ce7a9848 100644 Binary files a/test2.exe and b/test2.exe differ diff --git a/tsthimem.exe b/tsthimem.exe index 405febaa..d0d6fc99 100644 Binary files a/tsthimem.exe and b/tsthimem.exe differ