d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #224 from nick-less/default

Browse source 
fix compile error under macos
This commit is contained in:
David Given 2021-04-26 17:34:09 +02:00 committed by GitHub
parent a740f476c2 2ae1f01f36
commit 7286c67e8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plat/linux68k/emu/musashi/m68kcpu.c
View file

@ -600,7 +600,12 @@ static void default_instr_hook_callback(unsigned int pc)
#if M68K_EMULATE_ADDRESS_ERROR #if M68K_EMULATE_ADDRESS_ERROR
#include <setjmp.h> #include <setjmp.h>
#ifdef _BSD_SETJMP_H
sigjmp_buf m68ki_aerr_trap;
#else
jmp_buf m68ki_aerr_trap; jmp_buf m68ki_aerr_trap;
#endif
#endif /* M68K_EMULATE_ADDRESS_ERROR */ #endif /* M68K_EMULATE_ADDRESS_ERROR */
/* ======================================================================== */ /* ======================================================================== */

2
plat/linux68k/emu/musashi/m68kcpu.h
View file

@ -609,7 +609,7 @@ extern sigjmp_buf m68ki_aerr_trap;
if(sigsetjmp(m68ki_aerr_trap, 0) != 0) \ if(sigsetjmp(m68ki_aerr_trap, 0) != 0) \
{ \ { \
m68ki_exception_address_error(m68k); \ m68ki_exception_address_error(m68k); \
if(m68ki_stopped) \ if(CPU_STOPPED) \
{ \ { \
if (m68ki_remaining_cycles > 0) \ if (m68ki_remaining_cycles > 0) \
m68ki_remaining_cycles = 0; \ m68ki_remaining_cycles = 0; \