BAKAPEE!!! i think i got the segment stuff down!! i just need the mory stuff now...

	modified:   16.exe
	deleted:    16/exmmtest/DEBUG.16
	modified:   16/exmmtest/MMDUMP.16
	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/lib/16_mm.c
	modified:   test.exe
	modified:   test2.exe
	modified:   tsthimem.exe

diff --git a/16.exe b/16.exe
index 810265f4e2229332ea0f68668977c817ca666ca1..48790e24366f002955d64918cf40722748db41d7 100644 (file)
Binary files a/16.exe and b/16.exe differ

diff --git a/16/exmmtest/DEBUG.16 b/16/exmmtest/DEBUG.16
deleted file mode 100644 (file)
index de6d9e3..0000000
--- a/16/exmmtest/DEBUG.16
+++ /dev/null
@@ -1,16 +0,0 @@
-Seg:0  Size:6972       Owner:0x19c6\r
-Seg:1b3c       Size:256        Owner:0x6484\r
-Seg:21c4       Size:34 Owner:0x19ce\r
-Seg:239b       Size:44134      Owner:0x19c2\r
-Seg:d022       Size:4294967263 Owner:0xf11\r
-Seg:d022       Size:4294967263 Owner:0xf11\r
-Seg:d022       Size:4294967263 Owner:0xf14\r
-Seg:d022       Size:4294967263 Owner:0xc514\r
-Seg:d022       Size:4294967263 Owner:0x19c2\r
-Seg:d022       Size:4294967263 Owner:0xc618\r
-Seg:d022       Size:4294967263 Owner:0x1819\r
-Seg:d022       Size:4294967263 Owner:0x1114\r
-Seg:d022       Size:4294967263 Owner:0xf11\r
-Seg:d022       Size:4294967263 Owner:0xf11\r
-Seg:d022       Size:419        Owner:0xf11\r
-Seg:e000       Size:4294909951 Owner:0x1114\r

diff --git a/16/exmmtest/MMDUMP.16 b/16/exmmtest/MMDUMP.16
index 54f110097b223b2d42171ee9e8950273ae8833bc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
Binary files a/16/exmmtest/MMDUMP.16 and b/16/exmmtest/MMDUMP.16 differ

diff --git a/DEBUG.16 b/DEBUG.16
deleted file mode 100644 (file)
index e06f471..0000000
--- a/DEBUG.16
+++ /dev/null
@@ -1,6 +0,0 @@
-Seg:0  Size:5376       Owner:0x168c\r
-Seg:1500       Size:256        Owner:0x5a12\r
-Seg:1600       Size:273        Owner:0x92aa\r
-Seg:1b9b       Size:17 Owner:0xffc1\r
-Seg:1d9c       Size:49764      Owner:0x2402\r
-Seg:e000       Size:4294909951 Owner:0x9b58\r

diff --git a/MMDUMP.16 b/MMDUMP.16
deleted file mode 100644 (file)
index 680bfda..0000000
Binary files a/MMDUMP.16 and /dev/null differ

diff --git a/PROFILE.16 b/PROFILE.16
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/bakapi.exe b/bakapi.exe
index 98ff40436bbaa2324e4c010c800414aa2f6527e2..e1c1f69d4d3888c58b7f4be6464892f2e74ecae1 100644 (file)
Binary files a/bakapi.exe and b/bakapi.exe differ

diff --git a/exmmtest.exe b/exmmtest.exe
index 5315f5015afa429fb0fefdfa17a6c805f30afcf7..eb7ba4e920d828ed103f2b8204a7b285d9e9fa01 100644 (file)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/fmemtest.exe b/fmemtest.exe
index 6ed619700c26d1edb80dde6b160d1f00544387a5..d67d4458a18e1e645bedab4afc7a0484690f4559 100644 (file)
Binary files a/fmemtest.exe and b/fmemtest.exe differ

diff --git a/fontgfx.exe b/fontgfx.exe
index d076545cfa2fc6754308d153199decf79829b5bc..0b932c07c0f67fd4a2bed43ad10da41a0c3df933 100644 (file)
Binary files a/fontgfx.exe and b/fontgfx.exe differ

diff --git a/fonttest.exe b/fonttest.exe
index 7c285fa5eac5dfd6d925cfee8c6328d5591d7450..2d6c1c5b9dd85a72e80eecf29aa7cec9f351013a 100644 (file)
Binary files a/fonttest.exe and b/fonttest.exe differ

diff --git a/inputest.exe b/inputest.exe
index 23ef2228968660f958aa4da74fca00762e439b0c..b8e4f4f8bd88f958b015d95e74ae749e4c9af518 100644 (file)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/makefile b/makefile
index 0b7b9225fa0889731c767056e7f115f7065749f3..75805bc0e5343297e643fa6d06d549a0361cd00b 100644 (file)
--- a/makefile
+++ b/makefile
@@ -24,7 +24,7 @@ WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 BAKAPIFLAGS=-fh=bakapi.hed
 SFLAGS=-sg -st -of+ -k32768#51200#49152#24576
 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
-ZFLAGS=-zk0 -zq -zu# -zm# -zc# -zdp# -zp16
+ZFLAGS=-zk0 -zq -zu -zc -zm# -zdp# -zp16
 CFLAGS=-mc -lr -l=dos -wo -x## -d2
 OFLAGS=-obmiler -out -oh -ei -zp8 -0 -fpi87  -onac -ol+ -ok####x
 FLAGS=$(OFLAGS) $(CFLAGS) $(DFLAGS) $(ZFLAGS)

diff --git a/maptest.exe b/maptest.exe
index aacc41f32e812da39b69da0b1f36af8ed943adff..6ad044742c1f2f004d59b12f8934ab7d33cead6e 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/palettec.exe b/palettec.exe
index ca7d070c8b88d78cc115b586525eb94cd50b50f0..b38c6f72cf81684a53b614438a9bc79fbd7f91b1 100644 (file)
Binary files a/palettec.exe and b/palettec.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index 23218e8d605f78b86809da8bb232d2345cc5cd5d..87b9f8e48325762dc514a33ec6f4795174bfc2fb 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index 17298293aec2c356e9c20a2764b4e57e0cbc9141..456b5b8152f476b203b6063a11de7ffc6360c5e6 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/sega.exe b/sega.exe
index 5c44f05bcb19daf05df92bd504ceeadd5e2563a7..9ed4ba3667632677042ea56936e2b8d497af5043 100644 (file)
Binary files a/sega.exe and b/sega.exe differ

diff --git a/sountest.exe b/sountest.exe
index 273a8d3f59fabcf3626009932593aea9804ce1f1..6df13ea9f8e96440d1653e678c34e4a75daef800 100644 (file)
Binary files a/sountest.exe and b/sountest.exe differ

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 764ecfe9d180fca81d0bc0edd40cf06a1f459eb6..1b887284b7a8a0257c1a65264fae9c96cfa7b653 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -713,32 +713,33 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //
 // detect EMS and allocate up to 64K at page frame
 //
-printf("               EMS1\n");
-printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");    //bug!
+//printf("             EMS1\n");
+//printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");  //bug!
        mmi->EMSmem = 0;
        for(i = 1;i < __argc;i++)
        {
                if(US_CheckParm(__argv[i],ParmStringsexmm) == 0)
                        goto emsskip;                           // param NOEMS
        }
-printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");    //bug!
+//printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");  //bug!
        if(MML_CheckForEMS())
        {
-printf("               EMS2\n");
-printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");    //bug!
+//printf("             EMS2\n");
+//printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");  //bug!
                MML_SetupEMS(mm);                                       // allocate space
-printf("               EMS3\n");
-printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");    //bug!
+//printf("             EMS3\n");
+//printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");  //bug!
                //TODO: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT!
                MML_UseSpace(mm->EMSpageframe,(MAPPAGES)*0x4000lu, mm);
-printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");    //bug!
-printf("               EMS4\n");
+//printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");  //bug!
+//printf("             EMS4\n");
                //if(mm->EMSVer<0x40)
                        MM_MapEMS(mm, mmi);                                     // map in used pages
                //else
                        //MM_MapXEMS(mm, mmi);                                  // map in used pages
        }
 
+mmi->XMSmem=0;
 goto xmsskip;
 
 //
@@ -751,11 +752,11 @@ emsskip:
                if(US_CheckParm(__argv[i],ParmStringsexmm) == 0)
                        goto xmsskip;                           // param NOXMS
        }
-printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");    //bug!
+//printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");  //bug!
        if(MML_CheckForXMS(mm))
        {
-printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");    //bug!
-printf("               XMS!\n");
+//printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");  //bug!
+//printf("             XMS!\n");
                MML_SetupXMS(mm, mmi);                                  // allocate as many UMBs as possible
        }
 
@@ -1552,12 +1553,12 @@ void MM_GetNewBlock(mminfo_t *mm)
                MML_ClearBlock(mm);
        mm->mmnew=mm->mmfree;
        mm->mmfree=mm->mmfree->next;
-       /*if(!(mm->mmnew=mm->mmfree))
+       if(!(mm->mmnew=mm->mmfree))
        {
-               printf("MM_GETNEWBLOCK: No free blocks!");
+               printf("MM_GETNEWBLOCK: No free blocks!\n");
                return;
        }
-       mm->mmfree=mm->mmfree->next;*/
+       mm->mmfree=mm->mmfree->next;
 }
 
 void MM_FreeBlock(mmblocktype *x, mminfo_t *mm)

diff --git a/test.exe b/test.exe
index c1a320d8e3c05f3d14cc53151d27c9f5dcaae599..c2fb85a4e9814abed3519ecfeb4cd381c82e8e46 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 0216f29cfd6cad84e61f8ee756bf3e356dd58288..1c8b210fe493d32b1d2c95417864f860d4bcad37 100644 (file)
Binary files a/test2.exe and b/test2.exe differ

diff --git a/tsthimem.exe b/tsthimem.exe
index 6d1f5bc17e7f2d28567a0488a76299cd0376e3fd..282bd13ede9bc83446ee5e8bbb9a2071df50eeb4 100644 (file)
Binary files a/tsthimem.exe and b/tsthimem.exe differ