Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Guard fatal()s in Banshee/V3 code in !RELEASE_BUILD

Browse source
This commit is contained in:
SarahW 2020-12-01 16:04:19 +00:00
commit e27e37179f
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/vid_voodoo_banshee.c
View file

@ -408,8 +408,11 @@ static void banshee_recalctimings(svga_t *svga)
svga->render = svga_render_32bpp_highres; svga->render = svga_render_32bpp_highres;
svga->bpp = 32; svga->bpp = 32;
break; break;
#ifndef RELEASE_BUILD
default: default:
fatal("Unknown pixel format %08x\n", banshee->vgaInit0); fatal("Unknown pixel format %08x\n", banshee->vgaInit0);
#endif
} }
svga->rowcount = 0; svga->rowcount = 0;
if (!(banshee->vidProcCfg & VIDPROCCFG_DESKTOP_TILE) && (banshee->vidProcCfg & VIDPROCCFG_HALF_MODE)) if (!(banshee->vidProcCfg & VIDPROCCFG_DESKTOP_TILE) && (banshee->vidProcCfg & VIDPROCCFG_HALF_MODE))
@ -968,8 +971,10 @@ static uint32_t banshee_cmd_read(banshee_t *banshee, uint32_t addr)
case 0x108: case 0x108:
break; break;
#ifndef RELEASE_BUILD
default: default:
fatal("Unknown banshee_cmd_read %08x\n", addr); fatal("Unknown banshee_cmd_read %08x\n", addr);
#endif
} }
return ret; return ret;
@ -1239,7 +1244,9 @@ static void banshee_reg_writel(uint32_t addr, uint32_t val, void *p)
break; break;
case SST_userIntrCMD: case SST_userIntrCMD:
#ifndef RELEASE_BUILD
fatal("userIntrCMD write %08x\n", val); fatal("userIntrCMD write %08x\n", val);
#endif
break; break;
case SST_swapbufferCMD: case SST_swapbufferCMD:
@ -1805,9 +1812,6 @@ void banshee_hwcursor_draw(svga_t *svga, int displine)
else \ else \
DECODE_RGB565(buf); \ DECODE_RGB565(buf); \
break; \ break; \
\
default: \
fatal("Unknown overlay pix fmt %i\n", banshee->overlay_pix_fmt); \
} \ } \
} while (0) } while (0)

9
src/vid_voodoo_banshee_blitter.c
View file

@ -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]; src_data = *(uint32_t *)&src_p[src_x_real];
break; break;
} }
#ifndef RELEASE_BUILD
default: default:
fatal("banshee_do_screen_to_screen_blt: unknown srcFormat %08x\n", voodoo->banshee_blt.srcFormat); 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 && 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); banshee_do_line(voodoo, 0);
break; break;
#ifndef RELEASE_BUILD
default: default:
fatal("banshee_do_2d_blit: unknown command=%08x\n", voodoo->banshee_blt.command); 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); banshee_polyfill_continue(voodoo, val);
break; break;
#ifndef RELEASE_BUILD
default: default:
fatal("launch area write, command=%08x\n", voodoo->banshee_blt.command); fatal("launch area write, command=%08x\n", voodoo->banshee_blt.command);
#endif
} }
break; 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); // pclog("colorPattern%02x=%08x\n", (addr >> 2) & 63, val);
break; break;
#ifndef RELEASE_BUILD
default: default:
fatal("Unknown 2D reg write %03x %08x\n", addr & 0x1fc, val); fatal("Unknown 2D reg write %03x %08x\n", addr & 0x1fc, val);
#endif
} }
} }