From bed505fd911f5ebfb15ce24c19d245f5725e39ab Mon Sep 17 00:00:00 2001 From: fgsfds Date: Tue, 15 Aug 2023 23:33:55 +0200 Subject: [PATCH] port: get rid of __builtin_trap --- port/fast3d/gfx_pc.cpp | 5 +++-- port/src/preprocess.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/port/fast3d/gfx_pc.cpp b/port/fast3d/gfx_pc.cpp index 8286b7c6c..a609e27a4 100644 --- a/port/fast3d/gfx_pc.cpp +++ b/port/fast3d/gfx_pc.cpp @@ -38,7 +38,7 @@ using namespace std; #define ALIGN(x, a) (((x) + (a - 1)) & ~(a - 1)) -#define SUPPORT_CHECK(x) if(!(x)) __builtin_trap() // assert(x) +#define SUPPORT_CHECK(x) assert(x) // SCALE_M_N: upscale/downscale M-bit integer to N-bit #define SCALE_5_8(VAL_) (((VAL_)*0xFF) / 0x1F) @@ -2511,7 +2511,8 @@ static void gfx_run_dl(Gfx* cmd) { break; default: fprintf(stderr, "gfx: unknown opcode %d, words %08x %08x\n", (s8)opcode, cmd->words.w0, cmd->words.w1); - __builtin_trap(); + fflush(stderr); + SUPPORT_CHECK(0 && "Unknown GBI opcode"); break; } ++cmd; diff --git a/port/src/preprocess.c b/port/src/preprocess.c index df52c66dd..cfe9e736d 100644 --- a/port/src/preprocess.c +++ b/port/src/preprocess.c @@ -853,7 +853,7 @@ static void preprocessPropObj(struct defaultobj *obj) default: fprintf(stderr, "unknown objtype: %02x @ %p\n", obj->type, obj); fflush(stderr); - __builtin_trap(); + assert(0 && "Unknown object type in prop list"); break; } }