PEEEEEEEEEE FACK!!!!!

	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.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 8a4d70a03623570dc6e682c0af1966d0ecb4cd0c..975ba2366612f6dbb61e0abd4b988de251b9d37d 100644 (file)
Binary files a/16.exe and b/16.exe differ

diff --git a/DEBUG.TXT b/DEBUG.TXT
index c441f4a3f13403bb761402dce14c19c8ecad248d..d48599becaf97399bb4ce8a9588c3c7bcf070290 100644 (file)
--- a/DEBUG.TXT
+++ b/DEBUG.TXT
@@ -1,3 +1,5 @@
-Seg:5500       Size:968880     Owner:0x768b\r
-Seg:f000       Size:67072      Owner:0x1060\r
-Seg:38fe       Size:48 Owner:0x0\r
+Seg:0  Size:46544      Owner:0x0\r
+Seg:b5d        Size:4096       Owner:0x1586\r
+Seg:199b       Size:9264       Owner:0x0\r
+Seg:5bdc       Size:541248     Owner:0x0\r
+Seg:e000       Size:131056     Owner:0x0\r

diff --git a/MMDUMP.TXT b/MMDUMP.TXT
index 8c695c1354791a45c4d1e4b77c7bca5863fe7f7b..c3648a3777c48b92a8a4f0808eb582e286a199bf 100644 (file)
Binary files a/MMDUMP.TXT and b/MMDUMP.TXT differ

diff --git a/exmmtest.exe b/exmmtest.exe
index 97d1437470ef9ad7e0a662859dc4dad86fb8c02d..f23c4b756df6f175da2d8daba6846ed461e1d59b 100644 (file)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/fmemtest.exe b/fmemtest.exe
index 27be6722db725454e2b4059c942f79a25e83f434..49bc0fedda565bc4b7b3ca9f9297b1090f9645e2 100644 (file)
Binary files a/fmemtest.exe and b/fmemtest.exe differ

diff --git a/fontgfx.exe b/fontgfx.exe
index a6c574198c3f45fc450c067d7d76157c875a838a..1925939b1c1e4934ca79a1041fff7a0c1f3f868a 100644 (file)
Binary files a/fontgfx.exe and b/fontgfx.exe differ

diff --git a/fonttest.exe b/fonttest.exe
index 43a4e89751b432595aebd24409df430c2990aad9..10e0fc03b3501b1b4c79f1c212fe730903d9454d 100644 (file)
Binary files a/fonttest.exe and b/fonttest.exe differ

diff --git a/inputest.exe b/inputest.exe
index a23905b5dac23c7c90c436553ea4f2676724cd54..ec6d4d9d75cda366d111a67c26391b8b6f9d0eea 100644 (file)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/makefile b/makefile
index 3d27a0de7330cb34f747ae9256b64200ec4742f7..8a54f8bbf6dfa210b4d33baa988912c7758db5a8 100644 (file)
--- a/makefile
+++ b/makefile
@@ -15,7 +15,7 @@ TARGET_OS = dos
 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1# -zm
 CFLAGS=-zk0 -wo -x -mc -zu -k32768#16384# -zdp# -zp16 -zq
 OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+
-FLAGS=-0 -lr $(OFLAGS) $(CFLAGS) $(DFLAGS) -d2
+FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS) $(DFLAGS)
 SRC=src$(DIRSEP)
 SRCLIB=$(SRC)lib$(DIRSEP)
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)

diff --git a/maptest.exe b/maptest.exe
index ac7236cb3bc95c40d340ad2638bcbd5bf0f293ab..a7f711ebae9b07d78bccf1b441c30ab6f8686f78 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/palettec.exe b/palettec.exe
index 7092088f45b42d12cc875aa32a34903aae4dbb04..d5f554ab96ffad88c460986e6c2bf7b2e10c2ad1 100644 (file)
Binary files a/palettec.exe and b/palettec.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index 9a4741b62a12d4448c939f561c8b1a53d0508b71..02104a6b58037b8c906a7ce555c1b89afbf54af7 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/sountest.exe b/sountest.exe
index dd1e01817fcb930b3ccafb8803d03517d4221e4c..89ed95df5c33fab82b6ad657168907802d1ae395 100644 (file)
Binary files a/sountest.exe and b/sountest.exe differ

diff --git a/src/exmmtest.c b/src/exmmtest.c
index b1cd9468ad684add965a46498d15962de1392375..cdd390f8f7f2b2a15bb331c7bc949a7d6f17752f 100644 (file)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -24,7 +24,7 @@
 */
 #include "src/lib/16_ca.h"
 #include "src/lib/16_mm.h"
-#include "src/lib/modex16.h"
+//#include "src/lib/modex16.h"
 
 #define FILERL
 //#define FILEINIT
@@ -34,10 +34,10 @@ main(int argc, char *argv[])
 {
        static mminfo_t mm; mminfotype mmi;
        static memptr   bigbuffer;
-       __segment segu;
+       static __segment segu;
        static char *bakapee;
-       static word baka;
-       page_t screen;
+       word baka;
+       //static page_t screen;
 
        printf("&main()=%Fp\n", *argv[0]);
        printf("&argc=%Fp\n", FP_SEG(&argc));
@@ -54,12 +54,13 @@ main(int argc, char *argv[])
 
        /* setup camera and screen~ */
        //bug!!!\r
-       /*screen = modexDefaultPage();\r
-       screen.width += (16*2);\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);
+       //segu=mmi.segu;
        printf("                done!\n");
        /*if(FP_SEG(*argv[0])==0)
        {
@@ -91,13 +92,13 @@ main(int argc, char *argv[])
        printf("medium blue = non purgable\n");
        printf("red = locked\n");
        getch();
-       modexEnter();
-       modexShowPage(&screen);
-       MM_ShowMemory(&screen, &mm);
-       getch();
+       //modexEnter();
+       //modexShowPage(&screen);
+       MM_ShowMemory(/*&screen, */&mm);
+       //getch();
        MM_DumpData(&mm);
-       modexLeave();
-       MM_Report(&screen, &mm, &mmi);
+       //modexLeave();
+       MM_Report(&mm, &mmi);
        printf("                stop!\n");
        MM_FreePtr(&bigbuffer, &mm);
        MM_Shutdown(&mm);

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index e61b2deb9610ba80b761ae99425b8fa2cf4d6a5f..c85297a83a211608eb65f498b744331fd7013490 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -641,7 +641,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //
 // set up the linked list (everything in the free list;
 //
-//     printf("                linked list making!\n");
+       printf("                linked list making!\n");
        mm->mmhead = NULL;
        mm->mmfree = &(mm->mmblocks[0]);
        for(i=0;i<MAXBLOCKS-1;i++)
@@ -653,11 +653,11 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //
 // locked block of all memory until we punch out free space
 //
-//     printf("                newblock making!\n");
+       printf("                newblock making!\n");
        MM_GetNewBlock(mm);
        mm->mmhead = mm->mmnew;                         // this will allways be the first node
        mm->mmnew->start = 0;
-       mm->mmnew->length = 0xffff;
+       mm->mmnew->length = 0x1;
        mm->mmnew->attributes = LOCKBIT;
        mm->mmnew->next = NULL;
        mm->mmrover = mm->mmhead;
@@ -669,7 +669,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //---- length=coreleft();
        //_nheapgrow();
        length=_memmax();
-       //printf("      %u\n", length);
+       //printf("      %Fp\n", mmi->segu);
        start = (void huge *)(mm->nearheap = _nmalloc(length));
        length -= 16-(FP_OFF(start)&15);
        length -= SAVENEARHEAP;
@@ -691,7 +691,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
                        printf( "ERROR - bad node in nearheap\n" );
                break;
        }*/
-//     printf("                near heap ok!\n");
+       printf("                near heap ok!\n");
 
 //
 // get all available far conventional memory segments
@@ -700,6 +700,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
        printf("                farheap making!\n");
        _fheapgrow();
        length=0xffffUL*4UL;//_memavl();
+       //printf("      %Fp\n", mmi->segu);
        start = mm->farheap = halloc(length, sizeof(byte));
        //start = mm->farheap = _fmalloc(length);
        length -= 16-(FP_OFF(start)&15);
@@ -723,7 +724,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
                        printf( "ERROR - bad node in farheap\n" );
                break;
        }*/
-       //printf("              far heap ok!\n");
+       printf("                far heap ok!\n");
 
 //
 // detect EMS and allocate up to 64K at page frame
@@ -769,13 +770,18 @@ 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
        {
 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
+               //++++
+               MML_SetupXMS(mm, mmi);                                  // allocate as many UMBs as possible
        }
 
 //
 // allocate the misc buffer
 //
 xmsskip:
+/*mmi->nearheap = 0;
+mmi->farheap = 0;
+mmi->EMSmem = 0;
+mmi->XMSmem = 0;*/
        mm->mmrover = mm->mmhead;               // start looking for space after low block
 
        MM_GetPtr(&(mm->bufferseg),BUFFERSIZE, mm, mmi);
@@ -1147,7 +1153,7 @@ void MM_SortMem(mminfo_t *mm)
 =====================
 */
 
-void MM_ShowMemory(page_t *page, mminfo_t *mm)
+void MM_ShowMemory(/*page_t *page, */mminfo_t *mm)
 {
        mmblocktype huge *scan;
        word color,temp;
@@ -1191,19 +1197,19 @@ CA_OpenDebug ();
                                //modexhlin(page, scan->start, (unsigned)end, chy, color);
                                //for(chx=scan->start;chx+4>=(word)end;chx+=4)
                                //{
-                                       modexClearRegion(page, chx, chy, 4, 4, color);
+//++++                                 modexClearRegion(page, chx, chy, 4, 4, color);
                                //}
 
 //++++         VW_Hlin(scan->start,(unsigned)end,0,color);
 
 //++++         VW_Plot(scan->start,0,15);
-                               modexClearRegion(page, chx, chy, 4, 4, 15);
+//++++                         modexClearRegion(page, chx, chy, 4, 4, 15);
                if(scan->next->start > end+1)
 //++++                 VW_Hlin(end+1,scan->next->start,0,0);   // black = free
                        //for(chx=scan->next->start;chx+4>=(word)end+1;chx+=4)
                        //{
-                               chx+=scan->next->start;
-                               modexClearRegion(page, chx, chy, 4, 4, 2);
+//++++                         chx+=scan->next->start;
+//++++                         modexClearRegion(page, chx, chy, 4, 4, 2);
                        //}
                                        //modexhlin(page, end+1,scan->next->start, chy, 0);
 
@@ -1232,7 +1238,7 @@ strcat (scratch,str);
 strcat (scratch,"\n");
 write(debughandle,scratch,strlen(scratch));
 //modexprint(page, chx, chy, 1, 0, 24, &scratch);
-chy+=4;
+//++++chy+=4;
 //fprintf(stdout, "%s", scratch);
 //****#endif
 
@@ -1387,7 +1393,7 @@ dword MM_TotalFree(mminfo_t *mm)
 =====================
 */
 
-void MM_Report(page_t *page, mminfo_t *mm, mminfotype *mmi)
+void MM_Report(/*page_t *page, */mminfo_t *mm, mminfotype *mmi)
 {
        if(MML_CheckForEMS())
        {

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 8d71369dd7be6937e195ab23e3f72501e1968260..ff60c63fd95c051d7470f14a0d0be46c05a84770 100644 (file)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -36,12 +36,12 @@
 #endif
 
 
-#define SAVENEARHEAP   0//x400         // space to leave in data segment
+#define SAVENEARHEAP   0x400           // space to leave in data segment
 #define SAVEFARHEAP    0//x4000                        // space to leave in far heap
 
 #define        BUFFERSIZE              0x1000          // miscelanious, allways available buffer
 
-#define MAXBLOCKS              720
+#define MAXBLOCKS              600//720
 
 
 
@@ -86,11 +86,13 @@
 //==========================================================================
 //I hope this is correct!
 //__segment                seg;
-typedef void __based(__self) * memptr; //__based(seg) * memptr;
+typedef void __based(__self) *memptr; //__based(seg) * memptr;
 
 typedef struct
 {
        dword   nearheap,farheap,EMSmem,XMSmem,mainmem;
+       //word __based(__segname("_CODE")) segu;
+//
 } mminfotype;
 
 //==========================================================================
@@ -182,11 +184,11 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm);
 void MM_SetPurge(memptr *baseptr, int purge, mminfo_t *mm);
 void MM_SetLock(memptr *baseptr, boolean locked, mminfo_t *mm);
 void MM_SortMem(mminfo_t *mm);
-void MM_ShowMemory(page_t *page, mminfo_t *mm);
+void MM_ShowMemory(/*page_t *page, */mminfo_t *mm);
 void MM_DumpData(mminfo_t *mm);
 dword MM_UnusedMemory(mminfo_t *mm);
 dword MM_TotalFree(mminfo_t *mm);
-void MM_Report(page_t *page, mminfo_t *mm, mminfotype *mmi);
+void MM_Report(/*page_t *page, */mminfo_t *mm, mminfotype *mmi);
 static void MM_EMSerr(byte *stri, byte err);
 void MM_BombOnError(boolean bomb, mminfo_t *mm);
 void MM_GetNewBlock(mminfo_t *mm);

diff --git a/test.exe b/test.exe
index 6001ac60999730c143e4c23a7b633358fa736679..f442a1216b6a6d589caad6266fd9706da053cf98 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 5e5e674b101dc619d6f4a88d992b0cde06c99531..4a62d408416fc32736eec36e70eaa63bbb88b692 100644 (file)
Binary files a/test2.exe and b/test2.exe differ

diff --git a/tsthimem.exe b/tsthimem.exe
index f726c5ea1e585069ed9ee65724294c1e911fc944..1b69eda14a1df64bf96f0fac601d91b96aefac9d 100644 (file)
Binary files a/tsthimem.exe and b/tsthimem.exe differ