From e27e37179f41d689860081d992c02d0e3793ecf1 Mon Sep 17 00:00:00 2001 From: SarahW Date: Tue, 1 Dec 2020 16:04:19 +0000 Subject: [PATCH] Guard fatal()s in Banshee/V3 code in !RELEASE_BUILD --- src/vid_voodoo_banshee.c | 12 ++++++++---- src/vid_voodoo_banshee_blitter.c | 9 ++++++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/vid_voodoo_banshee.c b/src/vid_voodoo_banshee.c index 18530d9..2ac803e 100644 --- a/src/vid_voodoo_banshee.c +++ b/src/vid_voodoo_banshee.c @@ -408,8 +408,11 @@ static void banshee_recalctimings(svga_t *svga) svga->render = svga_render_32bpp_highres; svga->bpp = 32; break; + +#ifndef RELEASE_BUILD default: fatal("Unknown pixel format %08x\n", banshee->vgaInit0); +#endif } svga->rowcount = 0; if (!(banshee->vidProcCfg & VIDPROCCFG_DESKTOP_TILE) && (banshee->vidProcCfg & VIDPROCCFG_HALF_MODE)) @@ -967,9 +970,11 @@ static uint32_t banshee_cmd_read(banshee_t *banshee, uint32_t addr) case 0x108: break; - + +#ifndef RELEASE_BUILD default: fatal("Unknown banshee_cmd_read %08x\n", addr); +#endif } return ret; @@ -1239,7 +1244,9 @@ static void banshee_reg_writel(uint32_t addr, uint32_t val, void *p) break; case SST_userIntrCMD: +#ifndef RELEASE_BUILD fatal("userIntrCMD write %08x\n", val); +#endif break; case SST_swapbufferCMD: @@ -1805,9 +1812,6 @@ void banshee_hwcursor_draw(svga_t *svga, int displine) else \ DECODE_RGB565(buf); \ break; \ - \ - default: \ - fatal("Unknown overlay pix fmt %i\n", banshee->overlay_pix_fmt); \ } \ } while (0) diff --git a/src/vid_voodoo_banshee_blitter.c b/src/vid_voodoo_banshee_blitter.c index ac35fbb..f6f0d03 100644 --- a/src/vid_voodoo_banshee_blitter.c +++ b/src/vid_voodoo_banshee_blitter.c @@ -563,9 +563,10 @@ static void do_screen_to_screen_line(voodoo_t *voodoo, uint8_t *src_p, int use_x src_data = *(uint32_t *)&src_p[src_x_real]; break; } - +#ifndef RELEASE_BUILD default: fatal("banshee_do_screen_to_screen_blt: unknown srcFormat %08x\n", voodoo->banshee_blt.srcFormat); +#endif } if ((voodoo->banshee_blt.dstFormat & DST_FORMAT_COL_MASK) == DST_FORMAT_COL_16_BPP && @@ -1101,8 +1102,10 @@ static void banshee_do_2d_blit(voodoo_t *voodoo, int count, uint32_t data) banshee_do_line(voodoo, 0); break; +#ifndef RELEASE_BUILD default: fatal("banshee_do_2d_blit: unknown command=%08x\n", voodoo->banshee_blt.command); +#endif } } @@ -1389,8 +1392,10 @@ void voodoo_2d_reg_writel(voodoo_t *voodoo, uint32_t addr, uint32_t val) banshee_polyfill_continue(voodoo, val); break; +#ifndef RELEASE_BUILD default: fatal("launch area write, command=%08x\n", voodoo->banshee_blt.command); +#endif } break; @@ -1437,7 +1442,9 @@ void voodoo_2d_reg_writel(voodoo_t *voodoo, uint32_t addr, uint32_t val) // pclog("colorPattern%02x=%08x\n", (addr >> 2) & 63, val); break; +#ifndef RELEASE_BUILD default: fatal("Unknown 2D reg write %03x %08x\n", addr & 0x1fc, val); +#endif } }