From: sparky4 <sparky4@cock.li>
Date: Sun, 30 Aug 2015 14:45:23 +0000 (-0500)
Subject: pee!!!
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=18e9a8fb1179c8843a3dc67cbb8f69250265858f;p=16.git

pee!!!
	modified:   16.exe
	modified:   bakapi.exe
	modified:   exmmtest.exe
	modified:   fmemtest.exe
	modified:   fontgfx.exe
	modified:   fonttest.exe
	modified:   inputest.exe
	modified:   maptest.exe
	modified:   palettec.exe
	modified:   pcxtest.exe
	modified:   scroll.exe
	modified:   sountest.exe
	modified:   src/lib/modex16.c
	modified:   src/pcxtest.c
	modified:   test.exe
	modified:   test2.exe
	modified:   tsthimem.exe
---

diff --git a/16.exe b/16.exe
index f3c65e24..dcbdab22 100755
Binary files a/16.exe and b/16.exe differ
diff --git a/bakapi.exe b/bakapi.exe
index 6aed4ed8..1758a97f 100755
Binary files a/bakapi.exe and b/bakapi.exe differ
diff --git a/exmmtest.exe b/exmmtest.exe
index 6662ebe2..d274f3dd 100755
Binary files a/exmmtest.exe and b/exmmtest.exe differ
diff --git a/fmemtest.exe b/fmemtest.exe
index 5e69999c..fd8b5774 100755
Binary files a/fmemtest.exe and b/fmemtest.exe differ
diff --git a/fontgfx.exe b/fontgfx.exe
index a7a4a67c..e81edb50 100755
Binary files a/fontgfx.exe and b/fontgfx.exe differ
diff --git a/fonttest.exe b/fonttest.exe
index a2fcbcd3..130f28d5 100755
Binary files a/fonttest.exe and b/fonttest.exe differ
diff --git a/inputest.exe b/inputest.exe
index 1552031f..66fd13c9 100755
Binary files a/inputest.exe and b/inputest.exe differ
diff --git a/maptest.exe b/maptest.exe
index 767d6a37..648ec1ef 100755
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/palettec.exe b/palettec.exe
index 0e231e0b..492749c1 100755
Binary files a/palettec.exe and b/palettec.exe differ
diff --git a/pcxtest.exe b/pcxtest.exe
index bf4f6b52..fdd02e25 100755
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/scroll.exe b/scroll.exe
index 6116dc1b..291f39e5 100755
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/sountest.exe b/sountest.exe
index 9194021d..6ad59991 100755
Binary files a/sountest.exe and b/sountest.exe differ
diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 02fc2406..27ad0677 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -325,6 +325,10 @@ modexDrawBmpRegion(page_t *page, int x, int y,
     word rowCounter;
     byte planeCounter = 4;
 
+	printf("bmp->data=%Fp\n",bmp->data);
+	printf("*bmp->data=%Fp\n",*(bmp->data));
+	printf("&bmp->data=%Fp\n",&(bmp->data));
+
         //code is a bit slow here
     __asm {
                 MOV AX, SCREEN_SEG      ; go to the VGA memory
diff --git a/src/pcxtest.c b/src/pcxtest.c
index d955fdc9..be51733b 100755
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -80,52 +80,53 @@ void main() {
 
 	/* non sprite comparison */
 	start = *clockw;
-	for(i=0; i<100 ;i++) {
+	//for(i=0; i<100 ;i++) {
 		oldDrawBmp(VGA, 20, 20, &bmp, 0);
-	}
+	//}
 
 	start = *clockw;
-	for(i=0; i<100 ;i++) {
+	//for(i=0; i<100 ;i++) {
 //0000		modexDrawBmp(&page, 20, 20, &bmp);
-		modexDrawBmp(&page, 0, 0, &bmp);
-	}
+		modexDrawBmp(&page, 100, 100, &bmp);
+	//}
 	t1 = (*clockw-start) /18.2;
 
 	start = *clockw;
-	for(i=0; i<100; i++) {
+	//for(i=0; i<100; i++) {
 //0000		modexCopyPageRegion(&page, &page, 20, 20, 128, 20, 64, 64);
 		modexCopyPageRegion(&page, &page, 0, 0, 0, 0, 320, 240);
-	}
+	//}
 	t2 = (*clockw-start)/18.2;
 
 
 	start = *clockw;
-	for(i=0; i<100 ;i++) {
+	//for(i=0; i<100 ;i++) {
 		oldDrawBmp(VGA, 20, 20, &bmp, 1);
-	}
+	//}
 
 
 	start = *clockw;
-	for(i=0; i<100 ;i++) {
+	//for(i=0; i<100 ;i++) {
 //0000		modexDrawSprite(&page, 20, 20, &bmp);
-		modexDrawSprite(&page, 0, 0, &bmp);
-	}
+		modexDrawSprite(&page, 100, 100, &bmp);
+	//}
 	//_fmemset(MK_FP(0xA000, 0), (int)p->plane, SCREEN_WIDTH*(SCREEN_HEIGHT*2));
-	modexDrawBmp(&page, 0, 0, &bmp);
+	//modexDrawBmp(&page, 0, 0, &bmp);
 	while(!kbhit())
 	{
 		//DrawPBuf(&page, 0, 0, p, 0);
 	}
 	modexLeave();
+	printf("main=%Fp\n", &i);
 
 	printf("\n%d\n", sizeof(p->plane));
 	printf("%d\n", sizeof(bmp));
 
-	for(i=0; i<(320*240); i++)
+	/*for(i=0; i<(320*240); i++)
 	{
 		fprintf(stdout, "%d", bmp.data[i]);
 		if(i%320==0) fprintf(stdout, "\n");
-	}
+	}*/
 	printf("CPU to VGA: %f\n", t1);
 	printf("VGA to VGA: %f\n", t2);
 	return;
diff --git a/test.exe b/test.exe
index b17b6c52..ca406739 100755
Binary files a/test.exe and b/test.exe differ
diff --git a/test2.exe b/test2.exe
index d0c81863..79e5e10d 100755
Binary files a/test2.exe and b/test2.exe differ
diff --git a/tsthimem.exe b/tsthimem.exe
index 4287f673..a427bff2 100755
Binary files a/tsthimem.exe and b/tsthimem.exe differ