From 2bf05b75fba68e14a566366d8ee71153c7b56296 Mon Sep 17 00:00:00 2001 From: riccardom Date: Mon, 4 May 2009 18:09:09 +0000 Subject: [PATCH] Apply GPU.h hunk of ldesnogue's integer type patch at patch #2752961. Patch modified to use u32 instead of int for pointer math. --- desmume/src/GPU.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/desmume/src/GPU.h b/desmume/src/GPU.h index 2381145bd..aa303cbb7 100644 --- a/desmume/src/GPU.h +++ b/desmume/src/GPU.h @@ -826,25 +826,25 @@ struct GPU } }; -/* +#if 0 // normally should have same addresses static void REG_DISPx_pack_test(GPU * gpu) { REG_DISPx * r = gpu->dispx_st; - printf ("%08x %02x\n", r, (long)(&r->dispx_DISPCNT) - (long)r); - printf ("\t%02x\n", (long)(&r->dispA_DISPSTAT) - (long)r); - printf ("\t%02x\n", (long)(&r->dispx_VCOUNT) - (long)r); - printf ("\t%02x\n", (long)(&r->dispx_BGxCNT[0]) - (long)r); - printf ("\t%02x\n", (long)(&r->dispx_BGxOFS[0]) - (long)r); - printf ("\t%02x\n", (long)(&r->dispx_BG2PARMS) - (long)r); - printf ("\t%02x\n", (long)(&r->dispx_BG3PARMS) - (long)r); - printf ("\t%02x\n", (long)(&r->dispx_WINCNT) - (long)r); - printf ("\t%02x\n", (long)(&r->dispx_MISC) - (long)r); - printf ("\t%02x\n", (long)(&r->dispA_DISP3DCNT) - (long)r); - printf ("\t%02x\n", (long)(&r->dispA_DISPCAPCNT) - (long)r); - printf ("\t%02x\n", (long)(&r->dispA_DISPMMEMFIFO) - (long)r); + printf ("%08x %02x\n", (u32)r, (u32)(&r->dispx_DISPCNT) - (u32)r); + printf ("\t%02x\n", (u32)(&r->dispA_DISPSTAT) - (u32)r); + printf ("\t%02x\n", (u32)(&r->dispx_VCOUNT) - (u32)r); + printf ("\t%02x\n", (u32)(&r->dispx_BGxCNT[0]) - (u32)r); + printf ("\t%02x\n", (u32)(&r->dispx_BGxOFS[0]) - (u32)r); + printf ("\t%02x\n", (u32)(&r->dispx_BG2PARMS) - (u32)r); + printf ("\t%02x\n", (u32)(&r->dispx_BG3PARMS) - (u32)r); +// printf ("\t%02x\n", (u32)(&r->dispx_WINCNT) - (u32)r); + printf ("\t%02x\n", (u32)(&r->dispx_MISC) - (u32)r); + printf ("\t%02x\n", (u32)(&r->dispA_DISP3DCNT) - (u32)r); + printf ("\t%02x\n", (u32)(&r->dispA_DISPCAPCNT) - (u32)r); + printf ("\t%02x\n", (u32)(&r->dispA_DISPMMEMFIFO) - (u32)r); } -*/ +#endif CACHE_ALIGN extern u8 GPU_screen[4*256*192]; CACHE_ALIGN extern u8 GPU_tempScreen[4*256*192];