X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2F16_mm.c;h=24f78c5bd67e5499be869a796f1f7b99b59a22d0;hb=fa6e5edb63e179496bf10150ec3a14715d852101;hp=4d126499ae79e7798e5f44cf441b00b72a301005;hpb=ee8ff115b770801a7028e34795cad0a0982a551c;p=16.git

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 4d126499..24f78c5b 100644
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -135,14 +135,15 @@ boolean MML_CheckForEMS(void)
 =======================
 */
 
-unsigned MML_SetupEMS(mminfo_t *mm)
+byte MML_SetupEMS(mminfo_t *mm)
 {
-	char	str[80],str2[10];
-	unsigned	err;
+	char	str[80];//,str2[10];
+	byte	err;
 	boolean errorflag=false;
 	union REGS CPURegs;
 
 	unsigned int EMSVer = 0;
+	//byte	EMS_status;
 	unsigned	totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
 	totalEMSpages = freeEMSpages = EMSpageframe = EMSpagesmapped = 0;
 
@@ -151,6 +152,7 @@ unsigned MML_SetupEMS(mminfo_t *mm)
 		mov	ah,EMS_STATUS
 		int	EMS_INT						// make sure EMS hardware is present
 		or	ah,ah
+		//mov	[EMS_status],ah
 		jnz	error
 
 		mov	ah,EMS_VERSION
@@ -197,6 +199,7 @@ getpages:
 		mov	[EMShandle],dx
 		jmp End
 error:
+		mov	err,ah
 		mov	errorflag,1
 		jmp End
 noEMS:
@@ -204,11 +207,12 @@ End:
 	}
 	if(errorflag==true)
 	{
-		err = CPURegs.h.ah;
+		//err = CPURegs.h.ah;
 		strcpy(str,"MML_SetupEMS: EMS error 0x");
-		itoa(err,str2,16);
-		strcpy(str,str2);
-		printf("%s\n",str);
+		//itoa(err,str2,16);
+		//strcat(str,&err);
+		//printf("%s\n",str);
+		printf("%s%x\n",str,err);
 		return err;
 	}
 	mm->totalEMSpages=totalEMSpages;
@@ -261,16 +265,17 @@ void MML_ShutdownEMS(mminfo_t *mm)
 ====================
 */
 
-unsigned MM_MapEMS(mminfo_t *mm)
+byte MM_MapEMS(mminfo_t *mm)
 {
-	char	str[80],str2[10];
-	unsigned	err, EMShandle;
+	char	str[80];//,str2[10];
+	unsigned	/*err, */EMShandle;
+	byte err;
 	boolean	errorflag=false;
 	int	i;
 	union REGS CPURegs;
 	EMShandle=mm->EMShandle;
 
-	for (i=0;i<4/*mm->EMSpagesmapped*/;i++)
+	for (i=0;i<MAPPAGES;i++)
 	{
 		__asm
 		{
@@ -283,51 +288,90 @@ unsigned MM_MapEMS(mminfo_t *mm)
 			jnz	error
 			jmp End
 			error:
+			mov	err,ah
 			mov	errorflag,1
 			End:
 		}
 		if(errorflag==true)
 		{
-			err = CPURegs.h.ah;
+			//err = CPURegs.h.ah;
 			strcpy(str,"MM_MapEMS: EMS error 0x");
-			itoa(err,str2,16);
-			strcpy(str,str2);
+			//itoa(err,str2,16);
+			//strcat(str,&err);
 			//printf("%s\n",str);
-			printf("FACK! %u\n", err);
+			printf("%s%x\n",str, err);
+			//printf("FACK! %x\n", err);
 			return err;
 		}
 	}
 	return 0;
 }
 
-/*
-SUB EMS.MapXPages (PhysicalStart, LogicalStart, NumPages, Handle)
+byte MM_MapXEMS(mminfo_t *mm)
+{
+
+//SUB EMS.MapXPages (PhysicalStart, LogicalStart, NumPages, Handle)
 
-  'Maps up to 4 logical EMS pages to physical pages in the page frame, where:
-  '
-  'PhysicalStart = Physical page first logical page is mapped to
-  'LogicalStart  = First logical page to map
-  'NumPages      = Number of pages to map (1 to 4)
-  'Handle        = EMS handle logical pages are allocated to
+	//Maps up to 4 logical EMS pages to physical pages in the page frame, where:
+	//PhysicalStart = Physical page first logical page is mapped to
+	//LogicalStart  = First logical page to map
+	//NumPages      = Number of pages to map (1 to 4)
+	//Handle        = EMS handle logical pages are allocated to
 
-  'Create a buffer containing the page information
-  FOR x = 0 TO NumPages - 1
-    MapInfo$ = MapInfo$ + MKI$(LogicalStart + x) + MKI$(PhysicalStart + x)
-  NEXT
+  /*//Create a buffer containing the page information
+//  FOR x = 0 TO NumPages - 1
+//    MapInfo$ = MapInfo$ + MKI$(LogicalStart + x) + MKI$(PhysicalStart + x)
+//  NEXT*/
 
-  Regs.ax = &H5000                           'Map the pages in the buffer
-  Regs.cx = NumPages                         'to the pageframe
-  Regs.dx = Handle
-  Regs.ds = VARSEG(MapInfo$)
-  Regs.si = SADD(MapInfo$)
-  InterruptX &H67, Regs, Regs
-  EMS.Error = (Regs.ax AND &HFF00&) \ &H100  'Store the status code
+//  Regs.ax = &H5000                           //Map the pages in the buffer
+//  Regs.cx = NumPages                         //to the pageframe
+//  Regs.dx = Handle
+//  Regs.ds = VARSEG(MapInfo$)
+//  Regs.si = SADD(MapInfo$)
+//  InterruptX &H67, Regs, Regs
+//	EMS.Error = (Regs.ax AND &HFF00&) \ &H100  //Store the status code
 
-END SUB
-*/
-void MM_MapXEMS(mminfo_t *mm)
-{
+//END SUB
+/*
+char	str[80];//,str2[10];
+	unsigned	EMShandle;
+	byte err;
+	boolean	errorflag=false;
+	int	i;
+	union REGS CPURegs;
+	EMShandle=mm->EMShandle;
 
+	for (i=0;i<MAPPAGES;i++)
+	{
+		__asm
+		{
+			mov	ah,EMS_MAPPAGE
+			mov	bx,[i]			// logical page
+			mov	al,bl			// physical page
+			mov	dx,[EMShandle]	// handle
+			int	EMS_INT
+			or	ah,ah
+			jnz	error
+			jmp End
+			error:
+			mov	err,ah
+			mov	errorflag,1
+			End:
+		}
+		if(errorflag==true)
+		{
+			//err = CPURegs.h.ah;
+			strcpy(str,"MM_MapEMS: EMS error 0x");
+			//itoa(err,str2,16);
+			//strcat(str,&err);
+			//printf("%s\n",str);
+			printf("%s%x\n",str, err);
+			//printf("FACK! %x\n", err);
+			return err;
+		}
+	}
+	return 0;
+*/
 }
 
 //==========================================================================
@@ -666,14 +710,15 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 	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("EMS1\n");
+printf("EMS1\n");
 		MML_SetupEMS(mm);					// allocate space
+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!
 		//TODO: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT!
 		MML_UseSpace(mm->EMSpageframe,(MAPPAGES)*0x4000lu, mm);
-//printf("EMS3\n");
+printf("EMS3\n");
 		MM_MapEMS(mm);					// map in used pages
-//printf("EMS4\n");
+printf("EMS4\n");
 		mmi->EMSmem = (MAPPAGES)*0x4000lu;
 	}
 
@@ -860,7 +905,7 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm)
 
 	if(!scan)
 	{
-		printf("MM_FreePtr: Block not found!");
+		printf("MM_FreePtr: Block not found!\n");
 		return;
 	}
 
@@ -1072,10 +1117,10 @@ void MM_SortMem(mminfo_t *mm)
 void MM_ShowMemory(page_t *page, mminfo_t *mm)
 {
 	mmblocktype huge *scan;
-	unsigned color,temp;
+	word color,temp;
 	long	end,owner;
 	word chx,chy;
-	char    scratch[160],str[16];
+	byte    scratch[160],str[16];
 
 //****	VW_SetDefaultColors();
 //****	VW_SetLineWidth(40);
@@ -1103,21 +1148,41 @@ CA_OpenDebug ();
 		if(scan->start<=end)
 		{
 			//printf(");
-			write (debughandle,"\nMM_ShowMemory: Memory block order currupted!\n",strlen("\nMM_ShowMemory: Memory block order currupted!\n"));
+			write(debughandle,"\nMM_ShowMemory: Memory block order currupted!\n",strlen("\nMM_ShowMemory: Memory block order currupted!\n"));
 			//modexprint(&page, chx, chy, 1, 0, 24, "\nMM_ShowMemory: Memory block order currupted!\n");
 			return;
 		}
 		end = scan->start+scan->length-1;
-				modexhlin(page, scan->start, (unsigned)end, chy, color);
+		chy = scan->start/320;
+		chx = scan->start%320;
+				//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);
+				//}
+
 //++++		VW_Hlin(scan->start,(unsigned)end,0,color);
-//void VW_Plot(unsigned x, unsigned y, unsigned color);
-//void VW_Hlin(unsigned xl, unsigned xh, unsigned y, unsigned color);
 
 //++++		VW_Plot(scan->start,0,15);
-				modexputPixel(page, scan->start, chy, 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
-					modexhlin(page, end+1,scan->next->start, chy, color);
+			//for(chx=scan->next->start;chx+4>=(word)end+1;chx+=4)
+			//{
+				chx+=scan->next->start;
+				modexClearRegion(page, chx, chy, 4, 4, 2);
+			//}
+					//modexhlin(page, end+1,scan->next->start, chy, 0);
+
+/*
+		end = scan->length-1;
+		y = scan->start/320;
+		x = scan->start%320;
+		VW_Hlin(x,x+end,y,color);
+		VW_Plot(x,y,15);
+		if (scan->next && scan->next->start > end+1)
+			VW_Hlin(x+end+1,x+(scan->next->start-scan->start),y,0);	// black = free
+*/
 
 //****#if 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!
@@ -1132,10 +1197,10 @@ owner = (unsigned)scan->useptr;
 ultoa (owner,str,16);
 strcat (scratch,str);
 strcat (scratch,"\n");
-write (debughandle,scratch,strlen(scratch));
+write(debughandle,scratch,strlen(scratch));
 //modexprint(page, chx, chy, 1, 0, 24, &scratch);
-//chy+=4;
-//fprintf(debughandle, "%s", scratch);
+chy+=4;
+//fprintf(stdout, "%s", scratch);
 //****#endif
 
 		scan = scan->next;
@@ -1149,70 +1214,70 @@ CA_CloseDebug ();
 }
 //****#endif
 
-//==========================================================================
-
-/*
-=====================
-=
-= MM_DumpData
-=
-=====================
-*/
-
-void MM_DumpData(mminfo_t *mm)
-{
-	mmblocktype far *scan,far *best;
-	long	lowest,oldlowest;
-	unsigned	owner;
-	char	lock,purge;
-	FILE	*dumpfile;
-
-
-	free (mm->nearheap);
-	dumpfile = fopen ("mmdump.txt","w");
-	if (!dumpfile){
-		printf("MM_DumpData: Couldn't open MMDUMP.TXT!");
+//==========================================================================
+
+/*
+=====================
+=
+= MM_DumpData
+=
+=====================
+*/
+
+void MM_DumpData(mminfo_t *mm)
+{
+	mmblocktype far *scan,far *best;
+	long	lowest,oldlowest;
+	word	owner;
+	byte	lock,purge;
+	FILE	*dumpfile;
+
+
+	free (mm->nearheap);
+	dumpfile = fopen ("mmdump.txt","w");
+	if (!dumpfile){
+		printf("MM_DumpData: Couldn't open MMDUMP.TXT!\n");
 		return;
-	}
-
-	lowest = -1;
-	do
-	{
-		oldlowest = lowest;
-		lowest = 0xffff;
-
-		scan = mm->mmhead;
-		while (scan)
-		{
-			owner = (unsigned)scan->useptr;
-
-			if (owner && owner<lowest && owner > oldlowest)
-			{
-				best = scan;
-				lowest = owner;
-			}
-
-			scan = scan->next;
-		}
-
-		if (lowest != 0xffff)
-		{
-			if (best->attributes & PURGEBITS)
-				purge = 'P';
-			else
-				purge = '-';
-			if (best->attributes & LOCKBIT)
-				lock = 'L';
-			else
-				lock = '-';
-			fprintf (dumpfile,"0x%p (%c%c) = %u\n"
-			,(unsigned)lowest,lock,purge,best->length);
-		}
-
-	} while (lowest != 0xffff);
-
-	fclose (dumpfile);
-	printf("MMDUMP.TXT created.");
+	}
+
+	lowest = -1;
+	do
+	{
+		oldlowest = lowest;
+		lowest = 0xffff;
+
+		scan = mm->mmhead;
+		while (scan)
+		{
+			owner = (word)scan->useptr;
+
+			if (owner && owner<lowest && owner > oldlowest)
+			{
+				best = scan;
+				lowest = owner;
+			}
+
+			scan = scan->next;
+		}
+
+		if (lowest != 0xffff)
+		{
+			if (best->attributes & PURGEBITS)
+				purge = 'P';
+			else
+				purge = '-';
+			if (best->attributes & LOCKBIT)
+				lock = 'L';
+			else
+				lock = '-';
+			fprintf (dumpfile,"0x%p (%c%c) = %u\n"
+			,(word)lowest,lock,purge,best->length);
+		}
+
+	} while (lowest != 0xffff);
+
+	fclose (dumpfile);
+	printf("MMDUMP.TXT created.\n");
 }
 
 //==========================================================================