From: sparky4 <sparky4@cock.li>
Date: Sat, 1 Aug 2015 01:38:58 +0000 (-0500)
Subject: BAKAPEE!!! i think i got the segment stuff down!! i just need the mory stuff now... 
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=bd59805ece70eeaa2bd7248bfac8d9d8940eca8a;p=16.git

BAKAPEE!!! i think i got the segment stuff down!! i just need the mory stuff now!! wwww
	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 810265f4..48790e24 100644
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
index de6d9e33..00000000
--- a/16/exmmtest/DEBUG.16
+++ /dev/null
@@ -1,16 +0,0 @@
-Seg:0	Size:6972	Owner:0x19c6
-Seg:1b3c	Size:256	Owner:0x6484
-Seg:21c4	Size:34	Owner:0x19ce
-Seg:239b	Size:44134	Owner:0x19c2
-Seg:d022	Size:4294967263	Owner:0xf11
-Seg:d022	Size:4294967263	Owner:0xf11
-Seg:d022	Size:4294967263	Owner:0xf14
-Seg:d022	Size:4294967263	Owner:0xc514
-Seg:d022	Size:4294967263	Owner:0x19c2
-Seg:d022	Size:4294967263	Owner:0xc618
-Seg:d022	Size:4294967263	Owner:0x1819
-Seg:d022	Size:4294967263	Owner:0x1114
-Seg:d022	Size:4294967263	Owner:0xf11
-Seg:d022	Size:4294967263	Owner:0xf11
-Seg:d022	Size:419	Owner:0xf11
-Seg:e000	Size:4294909951	Owner:0x1114
diff --git a/16/exmmtest/MMDUMP.16 b/16/exmmtest/MMDUMP.16
index 54f11009..e69de29b 100644
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
index e06f4714..00000000
--- a/DEBUG.16
+++ /dev/null
@@ -1,6 +0,0 @@
-Seg:0	Size:5376	Owner:0x168c
-Seg:1500	Size:256	Owner:0x5a12
-Seg:1600	Size:273	Owner:0x92aa
-Seg:1b9b	Size:17	Owner:0xffc1
-Seg:1d9c	Size:49764	Owner:0x2402
-Seg:e000	Size:4294909951	Owner:0x9b58
diff --git a/MMDUMP.16 b/MMDUMP.16
deleted file mode 100644
index 680bfda4..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 98ff4043..e1c1f69d 100644
Binary files a/bakapi.exe and b/bakapi.exe differ
diff --git a/exmmtest.exe b/exmmtest.exe
index 5315f501..eb7ba4e9 100644
Binary files a/exmmtest.exe and b/exmmtest.exe differ
diff --git a/fmemtest.exe b/fmemtest.exe
index 6ed61970..d67d4458 100644
Binary files a/fmemtest.exe and b/fmemtest.exe differ
diff --git a/fontgfx.exe b/fontgfx.exe
index d076545c..0b932c07 100644
Binary files a/fontgfx.exe and b/fontgfx.exe differ
diff --git a/fonttest.exe b/fonttest.exe
index 7c285fa5..2d6c1c5b 100644
Binary files a/fonttest.exe and b/fonttest.exe differ
diff --git a/inputest.exe b/inputest.exe
index 23ef2228..b8e4f4f8 100644
Binary files a/inputest.exe and b/inputest.exe differ
diff --git a/makefile b/makefile
index 0b7b9225..75805bc0 100644
--- 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 aacc41f3..6ad04474 100644
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/palettec.exe b/palettec.exe
index ca7d070c..b38c6f72 100644
Binary files a/palettec.exe and b/palettec.exe differ
diff --git a/pcxtest.exe b/pcxtest.exe
index 23218e8d..87b9f8e4 100644
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/scroll.exe b/scroll.exe
index 17298293..456b5b81 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/sega.exe b/sega.exe
index 5c44f05b..9ed4ba36 100644
Binary files a/sega.exe and b/sega.exe differ
diff --git a/sountest.exe b/sountest.exe
index 273a8d3f..6df13ea9 100644
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 764ecfe9..1b887284 100644
--- 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 c1a320d8..c2fb85a4 100644
Binary files a/test.exe and b/test.exe differ
diff --git a/test2.exe b/test2.exe
index 0216f29c..1c8b210f 100644
Binary files a/test2.exe and b/test2.exe differ
diff --git a/tsthimem.exe b/tsthimem.exe
index 6d1f5bc1..282bd13e 100644
Binary files a/tsthimem.exe and b/tsthimem.exe differ