summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
67ec9f5)
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
19 files changed:
-Seg:0 Size:13296 Owner:0x8bfb\r
-Seg:33f Size:4096 Owner:0x32e2\r
-Seg:989 Size:24384 Owner:0xc0b6\r
-Seg:15c7 Size:828304 Owner:0xfd5c\r
-Seg:e000 Size:31344 Owner:0x5aa8\r
+Seg:0 Size:92208 Owner:0x5b92\r
+Seg:1683 Size:4096 Owner:0x7298\r
+Seg:1cad Size:8752 Owner:0xf686\r
+Seg:5ece Size:529184 Owner:0xfe\r
\r
MM_ShowMemory: Memory block order currupted!\r
\r
MM_ShowMemory: Memory block order currupted!\r
#-zkl = current codepage
DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1# -zm
#-zkl = current codepage
DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1# -zm
-CFLAGS=-zk0 -wo -x -mc -zu -k16384# -zdp# -zp16 -zq
+CFLAGS=-zk0 -wo -x -mc -zu -k32768#16384# -zdp# -zp16 -zq
OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+
OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+
-FLAGS=-0 -lr $(OFLAGS) $(CFLAGS) $(DFLAGS) #-d2
+FLAGS=-0 -lr $(OFLAGS) $(CFLAGS) $(DFLAGS) -d2
SRC=src$(DIRSEP)
SRCLIB=$(SRC)lib$(DIRSEP)
JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
SRC=src$(DIRSEP)
SRCLIB=$(SRC)lib$(DIRSEP)
JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
#include "src/lib/16_mm.h"
#include "src/lib/modex16.h"
#include "src/lib/16_mm.h"
#include "src/lib/modex16.h"
+//#define FILERL
+//#define FILEINIT
void
main(int argc, char *argv[])
void
main(int argc, char *argv[])
word baka;
page_t screen;
word baka;
page_t screen;
+ bakapee = _nmalloc(64);
// memset(bakapee, 0, 64);
mm.mmstarted=0;
if(argv[1]) bakapee = argv[1];
else bakapee = "data/koishi~~.pcx";
// memset(bakapee, 0, 64);
mm.mmstarted=0;
if(argv[1]) bakapee = argv[1];
else bakapee = "data/koishi~~.pcx";
- //if(argv[2])
- // #define FILEINIT
- /* setup camera and screen~ */\r
- screen = modexDefaultPage();\r
+ /* setup camera and screen~ */
+ //bug!!!\r
+ /*screen = modexDefaultPage();\r
screen.width += (16*2);\r
screen.width += (16*2);\r
- screen.height += (16*2);
+ screen.height += (16*2);*/
+ printf("&main()=%Fp start MM\n", *argv[0]);
MM_Startup(&mm, &mmi);
printf(" done!\n");
MM_Startup(&mm, &mmi);
printf(" done!\n");
+ /*if(FP_SEG(*argv[0])==0)
+ {
+ MM_Report(&screen, &mm, &mmi);
+ MM_Shutdown(&mm);
+ printf("&main()=%Fp\n", *argv[0]);
+ printf("&main() == %u\n", FP_SEG(*argv[0]));
+ exit(-5);
+ }*/
printf("&main()=%Fp\n", *argv[0]);
#ifdef FILERL
#ifdef FILEINIT
printf("&main()=%Fp\n", *argv[0]);
#ifdef FILERL
#ifdef FILEINIT
modexEnter();
modexShowPage(&screen);
MM_ShowMemory(&screen, &mm);
modexEnter();
modexShowPage(&screen);
MM_ShowMemory(&screen, &mm);
MM_DumpData(&mm);
modexLeave();
MM_Report(&screen, &mm, &mmi);
MM_DumpData(&mm);
modexLeave();
MM_Report(&screen, &mm, &mmi);
mm->mmnew->next = NULL;
mm->mmrover = mm->mmhead;
mm->mmnew->next = NULL;
mm->mmrover = mm->mmhead;
-// farlen=_bios_memsize()*1024;
-
//
// get all available near conventional memory segments
//
//
// get all available near conventional memory segments
//
//---- length=coreleft();
_nheapgrow();
length=_memavl();
//---- length=coreleft();
_nheapgrow();
length=_memavl();
- start = (void huge *)(mm->nearheap = malloc(length));
+ start = (void huge *)(mm->nearheap = _nmalloc(length));
length -= 16-(FP_OFF(start)&15);
length -= SAVENEARHEAP;
seglength = length / 16; // now in paragraphs
segstart = FP_SEG(start)+(FP_OFF(start)+15)/16;
MML_UseSpace(segstart,seglength, mm);
mmi->nearheap = length;
length -= 16-(FP_OFF(start)&15);
length -= SAVENEARHEAP;
seglength = length / 16; // now in paragraphs
segstart = FP_SEG(start)+(FP_OFF(start)+15)/16;
MML_UseSpace(segstart,seglength, mm);
mmi->nearheap = length;
- printf(" near heap ok!\n");
+ /*switch( _nheapchk() ) {
+ case _HEAPOK:
+ printf( "OK - nearheap is good\n" );
+ break;
+ case _HEAPEMPTY:
+ printf( "OK - nearheap is empty\n" );
+ break;
+ case _HEAPBADBEGIN:
+ printf( "ERROR - nearheap is damaged\n" );
+ break;
+ case _HEAPBADNODE:
+ printf( "ERROR - bad node in nearheap\n" );
+ break;
+ }*/
+// printf(" near heap ok!\n");
//
// get all available far conventional memory segments
//
// get all available far conventional memory segments
//---- length=farcoreleft();
printf(" farheap making!\n");
_fheapgrow();
//---- length=farcoreleft();
printf(" farheap making!\n");
_fheapgrow();
+ length=0xffffUL*4UL;//_memavl();
start = mm->farheap = halloc(length, sizeof(byte));
//start = mm->farheap = _fmalloc(length);
length -= 16-(FP_OFF(start)&15);
start = mm->farheap = halloc(length, sizeof(byte));
//start = mm->farheap = _fmalloc(length);
length -= 16-(FP_OFF(start)&15);
MML_UseSpace(segstart,seglength, mm);
mmi->farheap = length;
mmi->mainmem = mmi->nearheap + mmi->farheap;
MML_UseSpace(segstart,seglength, mm);
mmi->farheap = length;
mmi->mainmem = mmi->nearheap + mmi->farheap;
- printf(" far heap ok!\n");
-
+ /*switch( _fheapchk() ) {
+ case _HEAPOK:
+ printf( "OK - farheap is good\n" );
+ break;
+ case _HEAPEMPTY:
+ printf( "OK - farheap is empty\n" );
+ break;
+ case _HEAPBADBEGIN:
+ printf( "ERROR - farheap is damaged\n" );
+ break;
+ case _HEAPBADNODE:
+ printf( "ERROR - bad node in farheap\n" );
+ break;
+ }*/
+ //printf(" far heap ok!\n");
//
// detect EMS and allocate up to 64K at page frame
//
//
// detect EMS and allocate up to 64K at page frame
//
- printf(" EMS1\n\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\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
}
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");
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!
MML_SetupEMS(mm); // allocate space
printf(" EMS3\n");
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("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\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);
//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!
MM_MapEMS(mm, mmi); // map in used pages
MM_MapEMS(mm, mmi); // map in used pages
- //else
- // MM_MapXEMS(mm, mmi); // map in used pages
+ else
+ MM_MapXEMS(mm, mmi); // map in used pages
if(US_CheckParm(__argv[i],ParmStringsexmm) == 0)
goto xmsskip; // param NOXMS
}
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))
{
if(MML_CheckForXMS(mm))
{
- printf(" XMS!\n");
- //MML_SetupXMS(mm, mmi); // allocate as many UMBs as possible
+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
-#define SAVENEARHEAP 0x4000 // space to leave in data segment
-#define SAVEFARHEAP 0x4000 // space to leave in far heap
+#define SAVENEARHEAP 0x200 // space to leave in data segment
+#define SAVEFARHEAP 0//x4000 // space to leave in far heap
#define BUFFERSIZE 0x1000 // miscelanious, allways available buffer
#define BUFFERSIZE 0x1000 // miscelanious, allways available buffer
memptr bufferseg;
boolean mmstarted, bombonerror, mmerror;
void huge *farheap;
memptr bufferseg;
boolean mmstarted, bombonerror, mmerror;
void huge *farheap;
//byte EMS_status;
unsigned totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
unsigned int EMSVer;
//byte EMS_status;
unsigned totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
unsigned int EMSVer;