pvr: use new logging

core/hw/pvr/Renderer_if.cpp

@@ -386,7 +386,7 @@ void rend_init_renderer()
     			delete fallback_renderer;
     		die("Renderer initialization failed\n");
     	}
-    	printf("Selected renderer initialization failed. Falling back to default renderer.\n");
+    	INFO_LOG(PVR, "Selected renderer initialization failed. Falling back to default renderer.");
     	renderer  = fallback_renderer;
     	fallback_renderer = NULL;	// avoid double-free
     }
@@ -485,7 +485,7 @@ void rend_start_render()
 				int ch = fgetc(fCheckFrames);
 
 				if (ch == EOF) {
-					printf("Testing: TA Hash log matches, exiting\n");
+					INFO_LOG(PVR, "Testing: TA Hash log matches, exiting");
 					exit(1);
 				}
 				
@@ -548,7 +548,7 @@ void rend_start_render()
 		else
 		{
 			ovrn++;
-			printf("WARNING: Rendering context is overrun (%d), aborting frame\n",ovrn);
+			INFO_LOG(PVR, "WARNING: Rendering context is overrun (%d), aborting frame", ovrn);
 			tactx_Recycle(ctx);
 		}
 	}
@@ -585,6 +585,7 @@ void rend_vblank()
 {
 	if (!render_called && fb_dirty && FB_R_CTRL.fb_enable)
 	{
+		DEBUG_LOG(PVR, "Direct framebuffer write detected");
 		SetCurrentTARC(CORE_CURRENT_CTX);
 		ta_ctx->rend.isRenderFramebuffer = true;
 		rend_start_render();

core/hw/pvr/helper_classes.h

@@ -19,7 +19,7 @@ struct List
 		*overrun |= true;
 		Clear();
 		if (list_name != NULL)
-			printf("List overrun for list %s\n", list_name);
+			WARN_LOG(PVR, "List overrun for list %s", list_name);
 
 		return daty;
 	}

core/hw/pvr/pvr_mem.cpp

@@ -212,7 +212,7 @@ void YUV_data(u32* data , u32 count)
 //read
 u8 DYNACALL pvr_read_area1_8(u32 addr)
 {
-	EMUERROR("8-bit VRAM reads are not possible\n");
+	INFO_LOG(MEMORY, "%08x: 8-bit VRAM reads are not possible", addr);
 	return 0;
 }
 
@@ -228,7 +228,7 @@ u32 DYNACALL pvr_read_area1_32(u32 addr)
 //write
 void DYNACALL pvr_write_area1_8(u32 addr,u8 data)
 {
-	EMUERROR("8-bit VRAM writes are not possible\n");
+	INFO_LOG(MEMORY, "%08x: 8-bit VRAM writes are not possible", addr);
 }
 void DYNACALL pvr_write_area1_16(u32 addr,u16 data)
 {
@@ -263,7 +263,7 @@ void TAWrite(u32 address,u32* data,u32 count)
 	else //Vram Writef
 	{
 		//shouldn't really get here (?) -> works on dc :D need to handle lmmodes
-		//printf("Vram TAWrite 0x%X , bkls %d\n",address,count);
+		DEBUG_LOG(MEMORY, "Vram TAWrite 0x%X , bkls %d\n", address, count);
 		verify(SB_LMMODE0 == 0);
 		memcpy(&vram.data[address&VRAM_MASK],data,count*32);
 	}
@@ -293,7 +293,7 @@ extern "C" void DYNACALL TAWriteSQ(u32 address,u8* sqb)
 	else //Vram Writef
 	{
 		// Used by WinCE
-		//printf("Vram TAWriteSQ 0x%X SB_LMMODE0 %d\n",address, SB_LMMODE0);
+		DEBUG_LOG(MEMORY, "Vram TAWriteSQ 0x%X SB_LMMODE0 %d", address, SB_LMMODE0);
 		if (SB_LMMODE0 == 0)
 		{
 			// 64b path

core/hw/pvr/pvr_sb_regs.cpp

@@ -33,13 +33,13 @@ void do_pvr_dma()
 
 	if(0x8201 != (dmaor &DMAOR_MASK))
 	{
-		printf("\n!\tDMAC: DMAOR has invalid settings (%X) !\n", dmaor);
+		INFO_LOG(PVR, "DMAC: DMAOR has invalid settings (%X) !", dmaor);
 		return;
 	}
 
 	if (len & 0x1F)
 	{
-		printf("\n!\tDMAC: SB_C2DLEN has invalid size (%X) !\n", len);
+		INFO_LOG(PVR, "DMAC: SB_C2DLEN has invalid size (%X) !", len);
 		return;
 	}
 

core/hw/pvr/spg.cpp

@@ -197,19 +197,12 @@ int spg_line_sched(int tag, int cycl, int jit)
 
 				full_rps=(spd_fps+fskip/ts);
 
-				#ifdef TARGET_PANDORA
-				printf("CPU: %4.2f V: %4.2f (%s%s%4.2f) R: %4.2f+%4.2f\n",
-					spd_cpu*100/200,spd_vbs,
-					mode,res,fullvbs,
-					spd_fps,fskip/ts);
-				#else
-				printf("%s/%c - %4.2f - %4.2f - V: %4.2f (%.2f, %s%s%4.2f) R: %4.2f+%4.2f VTX: %4.2f%c, MIPS: %.2f\n",
+				INFO_LOG(COMMON, "%s/%c - %4.2f - %4.2f - V: %4.2f (%.2f, %s%s%4.2f) R: %4.2f+%4.2f VTX: %4.2f%c, MIPS: %.2f",
 					VER_SHORTNAME,'n',mspdf,spd_cpu*100/200,spd_vbs,
 					spd_vbs/full_rps,mode,res,fullvbs,
 					spd_fps,fskip/ts
 					, mv, mv_c, mips_counter/ 1024.0 / 1024.0);
 					mips_counter = 0;
-				#endif
 				
 				fskip=0;
 				last_fps=os_GetSeconds();

core/hw/pvr/ta.cpp

@@ -297,7 +297,7 @@ void DYNACALL ta_thd_data32_i(void* data)
 {
 	if (ta_ctx == NULL)
 	{
-		printf("Warning: data sent to TA prior to ListInit. Implied\n");
+		INFO_LOG(PVR, "Warning: data sent to TA prior to ListInit. Implied");
 		ta_vtx_ListInit();
 	}
 

core/hw/pvr/ta_vtx.cpp

@@ -159,7 +159,7 @@ public:
 
 	static Ta_Dma* DYNACALL NullVertexData(Ta_Dma* data,Ta_Dma* data_end)
 	{
-		printf("TA: Invalid state, ignoring VTX data\n");
+		INFO_LOG(PVR, "TA: Invalid state, ignoring VTX data");
 		return data+SZ32;
 	}
 
@@ -427,7 +427,7 @@ public:
 				//32B
 			case ParamType_Object_List_Set:
 				{
-					printf("Unsupported list type: ParamType_Object_List_Set\n");	// NAOMI Virtual on Oratorio Tangram
+					INFO_LOG(PVR, "Unsupported list type: ParamType_Object_List_Set");	// NAOMI Virtual on Oratorio Tangram
 
 					// *cough* ignore it :p
 					data+=SZ32;