Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Win,x64] Replaced inline assembly for int3 with debug_break() to fix compile errors in x64 builds.

Browse Source
This commit is contained in:
Thomas Roß 2024-05-15 19:55:45 +02:00
parent 6ecafd9e68
commit 0c09eed1b7
2 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libmve/mveasm.cpp
View File

@ -15,6 +15,8 @@
** attempt to derive source code of this material.
**
*/
#include "debug.h"
#include "pstypes.h"
#include "mvelibl.h"
#include "mvelibi.h"
@ -2053,19 +2055,6 @@ void gfxVres(unsigned char misc, unsigned char *crtc);
void MVE_gfxWaitRetrace(int state);
void MVE_gfxSetSplit(unsigned line);
#if defined(__LINUX__)
#if !defined(MACOSXPPC) && !defined(__aarch64__)
#define int3 __asm__ __volatile__("int $3");
#else
#define int3
#endif
#else
#define int3 \
__asm { int 3} \
;
#endif
void DECOMP_BODY(bool HI_COLOR_FLAG, const unsigned char *&comp, unsigned int _x, unsigned int _y, unsigned int _w,
unsigned int _h) {
@ -2322,37 +2311,37 @@ void nfDecompChg(const unsigned short *chgs, const unsigned short *parms, const
DECOMP_CHG_BODY(false, chgs, parms, comp, x, y, w, h);
}
void nfPkDecompH(unsigned char *ops, unsigned char *comp, unsigned x, unsigned y, unsigned w, unsigned h) { int3 }
void nfPkDecompD(unsigned char *ops, unsigned char *comp, unsigned x, unsigned y, unsigned w, unsigned h) { int3 }
void nfPkDecompH(unsigned char *ops, unsigned char *comp, unsigned x, unsigned y, unsigned w, unsigned h) { debug_break(); }
void nfPkDecompD(unsigned char *ops, unsigned char *comp, unsigned x, unsigned y, unsigned w, unsigned h) { debug_break(); }
void mve_ShowFrameField(unsigned char *buf, unsigned bufw, unsigned bufh, unsigned sx, unsigned sy, unsigned w,
unsigned h, unsigned dstx, unsigned dsty, unsigned field) {
int3
debug_break();
}
void mve_ShowFrameFieldHi(unsigned char *buf, unsigned bufw, unsigned bufh, unsigned sx, unsigned sy, unsigned w,
unsigned h, unsigned dstx, unsigned dsty, unsigned field) {
int3
debug_break();
}
void mve_sfShowFrameChg(bool prvbuf, unsigned x, unsigned y, unsigned w, unsigned h, unsigned short *chgs,
unsigned dstx, unsigned dsty) {
int3
debug_break();
}
void mve_sfHiColorShowFrameChg(bool prvbuf, unsigned x, unsigned y, unsigned w, unsigned h, unsigned short *chgs,
unsigned dstx, unsigned dsty) {
int3
debug_break();
}
void mve_sfPkShowFrameChg(bool prvbuf, unsigned x, unsigned y, unsigned w, unsigned h, unsigned char *ops,
unsigned dstx, unsigned dsty) {
int3
debug_break();
}
void mve_sfPkHiColorShowFrameChg(bool prvbuf, unsigned x, unsigned y, unsigned w, unsigned h, unsigned char *ops,
unsigned dstx, unsigned dsty) {
int3
debug_break();
}
void MVE_SetPalette(unsigned char *p, unsigned start, unsigned count) { int3 }
void palLoadCompPalette(unsigned char *buf) { int3 }
void gfxMode(unsigned mode) { int3 }
void gfxLoadCrtc(unsigned char *crtc, unsigned char chain4, unsigned char res) { int3 }
void gfxGetCrtc(unsigned char *crtc) { int3 }
void gfxVres(unsigned char misc, unsigned char *crtc) { int3 }
void MVE_gfxWaitRetrace(int state) { int3 }
void MVE_gfxSetSplit(unsigned line) { int3 }
void MVE_SetPalette(unsigned char *p, unsigned start, unsigned count) { debug_break(); }
void palLoadCompPalette(unsigned char *buf) { debug_break(); }
void gfxMode(unsigned mode) { debug_break(); }
void gfxLoadCrtc(unsigned char *crtc, unsigned char chain4, unsigned char res) { debug_break(); }
void gfxGetCrtc(unsigned char *crtc) { debug_break(); }
void gfxVres(unsigned char misc, unsigned char *crtc) { debug_break(); }
void MVE_gfxWaitRetrace(int state) { debug_break(); }
void MVE_gfxSetSplit(unsigned line) { debug_break(); }

6
netgames/includes/DMFC.h
View File

@ -308,8 +308,7 @@
do { \
if (DLLDebugBreak_callback_stop) \
DLLDebugBreak_callback_stop(); \
_asm { int 3} \
; \
debug_break(); \
if (DebugBreak_callback_resume) \
DebugBreak_callback_resume(); \
} while (0)
@ -335,8 +334,7 @@
mprintf((0, "Int3 at %s line %d.\n", __FILE__, __LINE__)); \
if (DLLDebugBreak_callback_stop) \
DLLDebugBreak_callback_stop(); \
_asm { int 3} \
; \
debug_break(); \
if (DLLDebugBreak_callback_resume) \
DLLDebugBreak_callback_resume(); \
} while (0)