octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6360 from SachinVin/b 

common\common_funcs.h:  use __builtin_trap for Crash()
This commit is contained in:
Mai 2023-03-21 21:55:35 -04:00 committed by GitHub
parent 0c3fe272b6 8434d30768
commit 8c12eb4905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/common_funcs.h
View File

@ -35,16 +35,16 @@
#define CITRA_NO_INLINE __attribute__((noinline)) #define CITRA_NO_INLINE __attribute__((noinline))
#endif #endif
#ifndef _MSC_VER #ifdef _MSC_VER
extern "C" {
#if CITRA_ARCH(x86_64) __declspec(dllimport) void __stdcall DebugBreak(void);
#define Crash() __asm__ __volatile__("int $3") }
#define Crash() DebugBreak()
#else #else
#define Crash() exit(1) #define Crash() __builtin_trap()
#endif #endif
#else // _MSC_VER #ifdef _MSC_VER
#if (_MSC_VER < 1900) #if (_MSC_VER < 1900)
// Function Cross-Compatibility // Function Cross-Compatibility
#define snprintf _snprintf #define snprintf _snprintf
@ -53,12 +53,7 @@
// Locale Cross-Compatibility // Locale Cross-Compatibility
#define locale_t _locale_t #define locale_t _locale_t
extern "C" { #endif // _MSC_VER
__declspec(dllimport) void __stdcall DebugBreak(void);
}
#define Crash() DebugBreak()
#endif // _MSC_VER ndef
// Generic function to get last error message. // Generic function to get last error message.
// Call directly after the command or use the error num. // Call directly after the command or use the error num.