puae 2.3.0

src/compemu_raw_x86.c

@@ -2115,18 +2115,18 @@ static void vec(int x, struct sigcontext sc)
 		write_log ("JIT: register was %d, direction was %d, size was %d\n",r,dir,size);
 
 		switch(r) {
-		case 0: pr=&(sc.CONTEXT_MEMBER(eax)); break;
-		case 1: pr=&(sc.CONTEXT_MEMBER(ecx)); break;
-		case 2: pr=&(sc.CONTEXT_MEMBER(edx)); break;
-		case 3: pr=&(sc.CONTEXT_MEMBER(ebx)); break;
-		case 4: pr=(size>1) ? NULL:(((uae_u8*)&(sc.CONTEXT_MEMBER(eax)))+1); break;
-		case 5: pr=(size>1) ?
+		case 0: pr = &(sc.CONTEXT_MEMBER(eax)); break;
+		case 1: pr = &(sc.CONTEXT_MEMBER(ecx)); break;
+		case 2: pr = &(sc.CONTEXT_MEMBER(edx)); break;
+		case 3: pr = &(sc.CONTEXT_MEMBER(ebx)); break;
+		case 4: pr = (size>1) ? NULL:(((uae_u8*)&(sc.CONTEXT_MEMBER(eax)))+1); break;
+		case 5: pr = (size>1) ?
 			(void*)(&(sc.CONTEXT_MEMBER(ebp))):
 			(void*)(((uae_u8*)&(sc.CONTEXT_MEMBER(ecx)))+1); break;
-		case 6: pr=(size>1) ?
+		case 6: pr = (size>1) ?
 			(void*)(&(sc.CONTEXT_MEMBER(esi))):
 			(void*)(((uae_u8*)&(sc.CONTEXT_MEMBER(edx)))+1); break;
-		case 7: pr=(size>1) ?
+		case 7: pr = (size>1) ?
 			(void*)(&(sc.CONTEXT_MEMBER(edi))):
 			(void*)(((uae_u8*)&(sc.CONTEXT_MEMBER(ebx)))+1); break;
 		default: abort();
@@ -2135,7 +2135,7 @@ static void vec(int x, struct sigcontext sc)
 			blockinfo* bi;
 
 			if (currprefs.comp_oldsegv) {
-				addr-=(uae_u8)NATMEM_OFFSET;
+				addr -= (uae_u8)NATMEM_OFFSET;
 
 				if ((addr>=0x10000000 && addr<0x40000000) ||
 					(addr>=0x50000000)) {
@@ -2160,7 +2160,7 @@ static void vec(int x, struct sigcontext sc)
 				write_log ("JIT: Handled one access!\n");
 				fflush(stdout);
 				segvcount++;
-				sc.CONTEXT_MEMBER(eip)+=len;
+				sc.CONTEXT_MEMBER(eip) += len;
 			}
 			else {
 				void* tmp=target;
@@ -2174,7 +2174,7 @@ static void vec(int x, struct sigcontext sc)
 						write_log ("JIT: Suspicious address 0x%x in SEGV handler.\n",addr);
 				}
 
-				target=(uae_u8*)sc.CONTEXT_MEMBER(eip);
+				target = (uae_u8*)sc.CONTEXT_MEMBER(eip);
 				for (i=0;i<5;i++)
 					vecbuf[i]=target[i];
 				emit_byte(0xe9);
@@ -2290,7 +2290,7 @@ enum {
 	X86_VENDOR_NEXGEN	= 4,
 	X86_VENDOR_CENTAUR	= 5,
 	X86_VENDOR_RISE		= 6,
-	X86_VENDOR_TRANSMETA	= 7,
+	X86_VENDOR_TRANSMETA= 7,
 	X86_VENDOR_NSC		= 8,
 	X86_VENDOR_UNKNOWN	= 0xff
 };

src/consolehook.c

@@ -58,7 +58,7 @@ static void *console_thread (void *v)
 {
 	uae_set_thread_priority (2);
 	for (;;) {
-		TCHAR wc = "a"; //console_getch ();
+		TCHAR wc = ""; //console_getch ();
 		char c[2];
 
 		write_log ("*");

src/picasso96.c

@@ -119,7 +119,6 @@ uae_u32 p96_rgbx16[65536];
 uae_u32 p96rc[256], p96gc[256], p96bc[256];
 
 struct PicassoResolution DisplayModes[MAX_PICASSO_MODES];
-
 static int mode_count = 0;
 
 static int cursorwidth, cursorheight, cursorok;
@@ -158,10 +157,9 @@ static void checkrtglibrary(void)
 			uae_u16 ver = get_word (v + 20);
 			uae_u16 rev = get_word (v + 22);
 			if (ver * 10000 + rev < UAE_RTG_LIBRARY_VERSION * 10000 + UAE_RTG_LIBRARY_REVISION) {
-		//		TCHAR msg[2000];
-		//		WIN32GUI_LoadUIString(IDS_OLDRTGLIBRARY, msg, sizeof(msg));
-		//		gui_message(msg, ver, rev, UAE_RTG_LIBRARY_VERSION, UAE_RTG_LIBRARY_REVISION);
-				write_log ("P96: rtg.library %d.%d\n", UAE_RTG_LIBRARY_VERSION, UAE_RTG_LIBRARY_REVISION);
+				TCHAR msg[2000];
+				sprintf(msg, "The installed LIBS:Picasso96/rtg.library (%d.%d) should be updated.\nA newer version is included in the ""Amiga Programs"" directory\n of the WinUAE distribution archive.\n\nNewer library version fixes graphics problems and increases performance.", ver, rev);
+				gui_message(msg);
 			} else {
 				write_log ("P96: rtg.library %d.%d detected\n", ver, rev);
 			}
@@ -262,49 +260,42 @@ static TCHAR *BuildBinaryString (uae_u8 value)
 
 static void DumpPattern (struct Pattern *patt)
 {
-/*
 	uae_u8 *mem;
 	int row, col;
 	for (row = 0; row < (1 << patt->Size); row++) {
 		mem = patt->Memory + row * 2;
 		for (col = 0; col < 2; col++) {
-	    write_log ("%s", BuildBinaryString (*mem++));
+			write_log ("%s ", BuildBinaryString (*mem++));
 		}
 		write_log ("\n");
 	}
-*/
 }
 
 static void DumpTemplate (struct Template *tmp, unsigned long w, unsigned long h)
 {
-/*
 	uae_u8 *mem = tmp->Memory;
-    int row, col, width;
+	unsigned int row, col, width;
 	width = (w + 7) >> 3;
 	write_log ("xoffset = %d, bpr = %d\n", tmp->XOffset, tmp->BytesPerRow);
 	for (row = 0; row < h; row++) {
 		mem = tmp->Memory + row * tmp->BytesPerRow;
 		for (col = 0; col < width; col++) {
-	    write_log ("%s", BuildBinaryString (*mem++));
+			write_log ("%s ", BuildBinaryString (*mem++));
 		}
 		write_log ("\n");
 	}
-*/
-  }
-
-int picasso_nr_resolutions (void)
-{
-    return mode_count;
 }
 
 static void ShowSupportedResolutions (void)
 {
 	int i = 0;
 
-    return;
-
-    for (i = 0; i < mode_count; i++)
-	write_log ("%s\n", DisplayModes[i].name);
+	write_log ("-----------------\n");
+	while (newmodes[i].depth >= 0) {
+		write_log ("%s\n", newmodes[i].name);
+		i++;
+	}
+	write_log ("-----------------\n");
 }
 
 #endif

src/tools/config.log

@@ -445,7 +445,7 @@ configure:4344: $? = 0
 configure:4344: result: yes
 configure:4350: checking for _doprnt
 configure:4350: gcc -o conftest -g -O2 -Wall -W -Wno-unused   conftest.c  >&5
-/tmp/ccZkLMtR.o: In function `main':
+/tmp/ccabWjHA.o: In function `main':
 /home/gnostic/puaex/src/tools/conftest.c:67: undefined reference to `_doprnt'
 collect2: ld returned 1 exit status
 configure:4350: $? = 1
@@ -533,7 +533,7 @@ configure:4364: $? = 0
 configure:4364: result: yes
 configure:4364: checking for strcmpi
 configure:4364: gcc -o conftest -g -O2 -Wall -W -Wno-unused   conftest.c  >&5
-/tmp/ccsA36F6.o: In function `main':
+/tmp/cc3FQfGP.o: In function `main':
 /home/gnostic/puaex/src/tools/conftest.c:69: undefined reference to `strcmpi'
 collect2: ld returned 1 exit status
 configure:4364: $? = 1
@@ -613,7 +613,7 @@ configure: failed program was:
 configure:4364: result: no
 configure:4364: checking for stricmp
 configure:4364: gcc -o conftest -g -O2 -Wall -W -Wno-unused   conftest.c  >&5
-/tmp/cc2Rto0a.o: In function `main':
+/tmp/ccFQJREU.o: In function `main':
 /home/gnostic/puaex/src/tools/conftest.c:69: undefined reference to `stricmp'
 collect2: ld returned 1 exit status
 configure:4364: $? = 1