From: sparky4 Date: Tue, 21 Jul 2015 18:18:57 +0000 (-0500) Subject: ==major fixings!==made major changes to the 16_mm and compilation stuff so that way... X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=452bdcbb38b63efd36bd68f795dbc31114c4c423 ==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 --- diff --git a/16.exe b/16.exe index bcf171f8..7f8f0d89 100644 Binary files a/16.exe and b/16.exe differ 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 08892014..0f9724e9 100644 Binary files a/exmmtest.exe and b/exmmtest.exe differ diff --git a/fmemtest.exe b/fmemtest.exe index 2a7db548..dd4e540b 100644 Binary files a/fmemtest.exe and b/fmemtest.exe differ diff --git a/fontgfx.exe b/fontgfx.exe index 612eaae8..6dae4b0b 100644 Binary files a/fontgfx.exe and b/fontgfx.exe differ diff --git a/fonttest.exe b/fonttest.exe index e5d7fa8d..f8d209f1 100644 Binary files a/fonttest.exe and b/fonttest.exe differ diff --git a/inputest.exe b/inputest.exe index b20e87ca..8573f4ea 100644 Binary files a/inputest.exe and b/inputest.exe differ 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 8c098e42..32f04da9 100644 Binary files a/maptest.exe and b/maptest.exe differ diff --git a/palettec.exe b/palettec.exe index edac065e..9135dbb9 100644 Binary files a/palettec.exe and b/palettec.exe differ diff --git a/pcxtest.exe b/pcxtest.exe index 45e2aede..194b23d6 100644 Binary files a/pcxtest.exe and b/pcxtest.exe differ diff --git a/sountest.exe b/sountest.exe index 3e85c76e..40807e63 100644 Binary files a/sountest.exe and b/sountest.exe differ 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 424e96f7..f6977eb1 100644 Binary files a/test.exe and b/test.exe differ diff --git a/test2.exe b/test2.exe index bca481f4..ba76d6b5 100644 Binary files a/test2.exe and b/test2.exe differ diff --git a/tsthimem.exe b/tsthimem.exe index 19118cf6..e9b1e380 100644 Binary files a/tsthimem.exe and b/tsthimem.exe differ