THE STACK IS FUCKING UP EVERYTHING! WWWW

	modified:   16.exe
	new file:   DEBUG.16
	new file:   MMDUMP.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:   test.exe
	modified:   test2.exe
	modified:   tsthimem.exe

diff --git a/16.exe b/16.exe
index 85e6fc4ae5fc0fa882794d4e1b0875641794c6e9..94c1d6cf2de0efddcdc7a931524c580d195759f2 100644 (file)
Binary files a/16.exe and b/16.exe differ

diff --git a/DEBUG.16 b/DEBUG.16
new file mode 100644 (file)
index 0000000..c522282
--- /dev/null
+++ b/DEBUG.16
@@ -0,0 +1,6 @@
+Seg:0  Size:5623       Owner:0xcc80\r
+Seg:15f7       Size:256        Owner:0x5a06\r
+Seg:16f7       Size:273        Owner:0x92a8\r
+Seg:1c92       Size:17 Owner:0x5d5a\r
+Seg:1e93       Size:49517      Owner:0x9bec\r
+Seg:e000       Size:4294909951 Owner:0x468d\r

diff --git a/MMDUMP.16 b/MMDUMP.16
new file mode 100644 (file)
index 0000000..4f7180f
Binary files /dev/null and b/MMDUMP.16 differ

diff --git a/bakapi.exe b/bakapi.exe
index a30c1bb0fb9af5d62a7c945593c444ceedf189cb..317cc1d855bff5b095d0eadc57831968b5e6686f 100644 (file)
Binary files a/bakapi.exe and b/bakapi.exe differ

diff --git a/exmmtest.exe b/exmmtest.exe
index 324f4f9df7bf486b8322f3d1a0c49fedff51e3ec..ec7106809eeeb08353e7b44b7637045fa6538a37 100644 (file)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/fmemtest.exe b/fmemtest.exe
index a5a7ab9a4cf70b579bdafc58e1daacb4d2d63500..d501860244bf3d951b4087c67a643c7d8ab1d792 100644 (file)
Binary files a/fmemtest.exe and b/fmemtest.exe differ

diff --git a/fontgfx.exe b/fontgfx.exe
index bf8a3afa9ad57c45357918957cc01ba562e56929..d5dd6f9458c51ac0cb7dc8a3384f30a310b21725 100644 (file)
Binary files a/fontgfx.exe and b/fontgfx.exe differ

diff --git a/fonttest.exe b/fonttest.exe
index 4de46206fe35baf05e1a4f725b59a171a2b19183..92c4b8848defe146a35f2ebe7d7498f2f8f70760 100644 (file)
Binary files a/fonttest.exe and b/fonttest.exe differ

diff --git a/inputest.exe b/inputest.exe
index c80839602041cbebf3ed6bc62a68962dabf1a78f..0f7150930b769a87f3d2ada13514c1acc3e0103a 100644 (file)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/makefile b/makefile
index 9eafa63955679815290c85c4179b3d2c6b492dec..6842c14817e6d010a9ce7b472c2462a5dcc8a078 100644 (file)
--- a/makefile
+++ b/makefile
@@ -22,13 +22,12 @@ WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
 16FLAGS=-fh=16.hed
 BAKAPIFLAGS=-fh=bakapi.hed
-#-st -zu
-SFLAGS=-k32768#51200#49152#24576
+SFLAGS=-sg -st -of+ -k32768#51200#49152#24576
 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
-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)
+ZFLAGS=-zk0 -zq -zu# -zm# -zc# -zdp# -zp16
+CFLAGS=-mc -lr -l=dos -wo -x -d2
+OFLAGS=-onatx -oh -oi -ei -zp8 -0 -fpi87#-oebrml -ol+
+FLAGS=$(OFLAGS) $(CFLAGS) $(DFLAGS) $(ZFLAGS)
 
 DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) midi.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)

diff --git a/maptest.exe b/maptest.exe
index 2b70d8315da09a1f5636209c15c34027884691e9..cbe8df706e6a17f9a621882518a2be6b798dc085 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/palettec.exe b/palettec.exe
index 7f2d270803614f8f8386b42b11c3bba57be72749..def0ef72cd9904b98d91ecca32db58e769dd67cd 100644 (file)
Binary files a/palettec.exe and b/palettec.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index 491a9cff2803ee2c2abe4e7be5cce327aad47e69..2d23d88cc6c159077bdc722db53b0ec33fa875f9 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index 9d132349001cea6551dda5f2deb63eda27ce99f1..7d734535cc0403c4e0e242fbbf51026075584dc0 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/sega.exe b/sega.exe
index f71de577db4e1ed077142e50d01f126460fa06e4..4d7e238c3cdcf03f6819417152800b27e5da2448 100644 (file)
Binary files a/sega.exe and b/sega.exe differ

diff --git a/sountest.exe b/sountest.exe
index db2fbe052dbc600e648524c5faa8bd1e4df79b3a..6a219c151df8aa00f40c6b3b79e61aae3545cdaf 100644 (file)
Binary files a/sountest.exe and b/sountest.exe differ

diff --git a/src/exmmtest.c b/src/exmmtest.c
index a1457aaefa9cef7d09db77f65bce42a45f67401f..c0bbc33224d18064f33429a29e8cf753144a2a9e 100644 (file)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -1,146 +1,146 @@
-/* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
- *
- * This file is part of Project 16.
- *
- * Project 16 is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Project 16 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>, or
- * write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-/*
-       exmm test
-*/
-#include <stdio.h>
-#include <bios.h>
-
-#include "src/lib/16_head.h"
-#include "src/lib/16_ca.h"
-#include "src/lib/16_mm.h"
-//#include "src/lib/modex16.h"
-//#pragma hdrstop\r
+/* Project 16 Source Code~\r
+ * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ *\r
+ * This file is part of Project 16.\r
+ *\r
+ * Project 16 is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * Project 16 is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>, or\r
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,\r
+ * Fifth Floor, Boston, MA 02110-1301 USA.\r
+ *\r
+ */\r
+/*\r
+       exmm test\r
+*/\r
+#include <stdio.h>\r
+#include <bios.h>\r
+\r
+#include "src/lib/16_head.h"\r
+#include "src/lib/16_ca.h"\r
+#include "src/lib/16_mm.h"\r
+//#include "src/lib/modex16.h"\r
+#pragma hdrstop\r
+\r
+#pragma warn -pro\r
+#pragma warn -use\r
+\r
+//file load or read definition\r
+#define FILERL\r
+//#define FILEREAD\r
+\r
+void\r
+main(int argc, char *argv[])\r
+{\r
+       mminfo_t mm; mminfotype mmi;\r
+       __segment sega;\r
+       void __based(sega)* bigbuffer;\r
+#ifdef FILERL\r
+       char *bakapee;\r
+       word baka;\r
+#endif\r
+       //static page_t screen;\r
+\r
+       printf("&main()=        %Fp\n", *argv[0]);\r
+       printf("bigbuffer=      %Fp\n", bigbuffer);\r
+       printf("&bigbuffer=     %Fp\n", &bigbuffer);\r
+       printf("bigbuffer=      %04x\n", bigbuffer);\r
+       printf("&bigbuffer=     %04x\n", &bigbuffer);\r
+\r
+#ifdef FILERL\r
+       bakapee = malloc(64);\r
+#endif\r
+       mm.mmstarted=0;\r
+\r
+#ifdef FILERL\r
+       if(argv[1]) bakapee = argv[1];\r
+       else bakapee = "data/koishi~.pcx";\r
+#endif\r
 \r
-//#pragma warn -pro\r
-//#pragma warn -use
-
-//file load or read definition
-#define FILERL
-//#define FILEREAD
-
-void
-main(int argc, char *argv[])
-{
-       mminfo_t mm; mminfotype mmi;
-       __segment sega;
-       void __based(sega)* bigbuffer;
-#ifdef FILERL
-       char *bakapee;
-       word baka;
-#endif
-       //static page_t screen;
-
-       printf("&main()=        %Fp\n", *argv[0]);
-       printf("bigbuffer=      %Fp\n", bigbuffer);
-       printf("&bigbuffer=     %Fp\n", &bigbuffer);
-       printf("bigbuffer=      %04x\n", bigbuffer);
-       printf("&bigbuffer=     %04x\n", &bigbuffer);
-
-#ifdef FILERL
-       bakapee = malloc(64);
-#endif
-       mm.mmstarted=0;
-
-#ifdef FILERL
-       if(argv[1]) bakapee = argv[1];
-       else bakapee = "data/koishi~.pcx";
-#endif
-
        textInit();\r
-
-       /* setup camera and screen~ */
+\r
+       /* setup camera and screen~ */\r
        //bug!!!\r
        //screen = modexDefaultPage();\r
        /*screen.width += (16*2);\r
-       screen.height += (16*2);*/
-
-       printf("main()=%Fp      start MM\n", *argv[0]);
-       MM_Startup(&mm, &mmi);
+       screen.height += (16*2);*/\r
+\r
+       printf("main()=%Fp      start MM\n", *argv[0]);\r
+       MM_Startup(&mm, &mmi);\r
        //PM_Startup();\r
        //PM_UnlockMainMem();\r
-       CA_Startup();
-       printf("                done!\n");
-       printf("&main()=        %Fp\n", *argv[0]);
-       printf("bigbuffer=      %Fp\n", bigbuffer);
-       printf("&bigbuffer=     %Fp\n", &bigbuffer);
-       printf("bigbuffer=      %04x\n", bigbuffer);
-       printf("&bigbuffer=     %04x\n", &bigbuffer);
-       getch();
-#ifdef FILERL
-//     bakapeehandle = open(bakapee,O_RDONLY | O_BINARY, S_IREAD);
-//     printf("size of big buffer~=%u\n", _bmsize(segu, bigbuffer));
-//     if(CA_FarRead(bakapeehandle,(void far *)&bigbuffer,sizeof(bigbuffer),&mm))
-#ifdef FILEREAD
-       printf("                read\n");
-       if(CA_ReadFile(bakapee, &bigbuffer, &mm))
-#else
-       printf("                load\n");
-       if(CA_LoadFile(bakapee, &bigbuffer, &mm, &mmi))
-#endif
-               baka=1;
-       else
-               baka=0;
-//     close(bakapeehandle);
-       //hmm functions in cache system use the buffered stuff
-       printf("size of big buffer~=%u\n", _bmsize(sega, bigbuffer));
-#endif
-       printf("dark purple = purgable\n");
-       printf("medium blue = non purgable\n");
-       printf("red = locked\n");
-       getch();
-       //++++modexEnter();
-       //++++modexShowPage(&screen);
-       MM_ShowMemory(/*&screen, */&mm);
-       //getch();
-       MM_DumpData(&mm);
-       //++++modexLeave();
-       MM_Report(&mm, &mmi);
-       printf("                stop!\n");
-#ifdef FILERL
-       MM_FreePtr(&bigbuffer, &mm);
-#endif
-       //PM_Shutdown();
-       CA_Shutdown();
-       MM_Shutdown(&mm);
-       printf("                done!\n");
-#ifdef FILERL
-       free(bakapee);
-       if(baka) printf("\nyay!\n");
-       else printf("\npoo!\n");
-#endif
-       printf("bigbuffer=      %Fp\n", bigbuffer);
-       printf("&bigbuffer=     %Fp\n", &bigbuffer);
-       printf("bigbuffer=      %04x\n", bigbuffer);
-       printf("&bigbuffer=     %04x\n", &bigbuffer);
-       printf("\n\n");
-       printf("Total free:                     %lu\n", (dword)(GetFreeSize()));
-       printf("Total near free:                %lu\n", (dword)(GetNearFreeSize()));
-       printf("Total far free:                 %lu\n", (dword)(GetFarFreeSize()));
-       getch();
-       printf("\n");
-       heapdump();
-       printf("core left:                      %lu\n", (dword)_coreleft());
-       printf("far core left:                  %lu\n", (dword)_farcoreleft());
-       //printf("based core left:                      %lu\n", (dword)_basedcoreleft());
-       //printf("huge core left:                       %lu\n", (dword)_hugecoreleft());
-}
+       CA_Startup();\r
+       printf("                done!\n");\r
+       printf("&main()=        %Fp\n", *argv[0]);\r
+       printf("bigbuffer=      %Fp\n", bigbuffer);\r
+       printf("&bigbuffer=     %Fp\n", &bigbuffer);\r
+       printf("bigbuffer=      %04x\n", bigbuffer);\r
+       printf("&bigbuffer=     %04x\n", &bigbuffer);\r
+       getch();\r
+#ifdef FILERL\r
+//     bakapeehandle = open(bakapee,O_RDONLY | O_BINARY, S_IREAD);\r
+//     printf("size of big buffer~=%u\n", _bmsize(segu, bigbuffer));\r
+//     if(CA_FarRead(bakapeehandle,(void far *)&bigbuffer,sizeof(bigbuffer),&mm))\r
+#ifdef FILEREAD\r
+       printf("                read\n");\r
+       if(CA_ReadFile(bakapee, &bigbuffer, &mm))\r
+#else\r
+       printf("                load\n");\r
+       if(CA_LoadFile(bakapee, &bigbuffer, &mm, &mmi))\r
+#endif\r
+               baka=1;\r
+       else\r
+               baka=0;\r
+//     close(bakapeehandle);\r
+       //hmm functions in cache system use the buffered stuff\r
+       printf("size of big buffer~=%u\n", _bmsize(sega, bigbuffer));\r
+#endif\r
+       printf("dark purple = purgable\n");\r
+       printf("medium blue = non purgable\n");\r
+       printf("red = locked\n");\r
+       getch();\r
+       //++++modexEnter();\r
+       //++++modexShowPage(&screen);\r
+       MM_ShowMemory(/*&screen, */&mm);\r
+       //getch();\r
+       MM_DumpData(&mm);\r
+       //++++modexLeave();\r
+       MM_Report(&mm, &mmi);\r
+       printf("                stop!\n");\r
+#ifdef FILERL\r
+       MM_FreePtr(&bigbuffer, &mm);\r
+#endif\r
+       //PM_Shutdown();\r
+       CA_Shutdown();\r
+       MM_Shutdown(&mm);\r
+       printf("                done!\n");\r
+#ifdef FILERL\r
+       free(bakapee);\r
+       if(baka) printf("\nyay!\n");\r
+       else printf("\npoo!\n");\r
+#endif\r
+       printf("bigbuffer=      %Fp\n", bigbuffer);\r
+       printf("&bigbuffer=     %Fp\n", &bigbuffer);\r
+       printf("bigbuffer=      %04x\n", bigbuffer);\r
+       printf("&bigbuffer=     %04x\n", &bigbuffer);\r
+       printf("\n\n");\r
+       printf("Total free:                     %lu\n", (dword)(GetFreeSize()));\r
+       printf("Total near free:                %lu\n", (dword)(GetNearFreeSize()));\r
+       printf("Total far free:                 %lu\n", (dword)(GetFarFreeSize()));\r
+       getch();\r
+       printf("\n");\r
+       heapdump();\r
+       printf("core left:                      %lu\n", (dword)_coreleft());\r
+       printf("far core left:                  %lu\n", (dword)_farcoreleft());\r
+       //printf("based core left:                      %lu\n", (dword)_basedcoreleft());\r
+       //printf("huge core left:                       %lu\n", (dword)_hugecoreleft());\r
+}\r

diff --git a/test.exe b/test.exe
index 4b164a397a1f7b9904a90a73fb430624187f46f2..f92b0fb3c3e47d1f00b99b521439437f84f70978 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 17b2e157be90d5ccc77e085e027170b971b993d6..b3bfa877887e3e314085160d0b074fd51689b33f 100644 (file)
Binary files a/test2.exe and b/test2.exe differ

diff --git a/tsthimem.exe b/tsthimem.exe
index 405febaa7b657108358ea7e8be18b9a62739dad1..07b43325c26c43574d2c79d971c79ea589129bba 100644 (file)
Binary files a/tsthimem.exe and b/tsthimem.exe differ