Expand RE_BREAKPOINT macro on ARM64 #961
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sreimers
reviewed
Sep 25, 2023
| @@ -81,6 +81,8 @@ typedef SSIZE_T ssize_t; | |||
| /** Defines a soft breakpoint */ | |||
| #if (defined(__i386__) || defined(__x86_64__)) | |||
| #define RE_BREAKPOINT __asm__("int $0x03") | |||
| #elif defined(__aarch64__) | |||
| #define RE_BREAKPOINT __builtin_debugtrap() | |||
There was a problem hiding this comment.
I think we can make this more generic with:
#elif defined(__has_builtin) && __has_builtin(__builtin_debugtrap)
#define RE_BREAKPOINT __builtin_debugtrap()Since __builtin_debugtrap() is clang only I think.
There was a problem hiding this comment.
Yes, that's much better. I've changed it accordingly.
There was a problem hiding this comment.
Looks like MSVC does not like this, can you try:
#if (defined(__i386__) || defined(__x86_64__))
#define RE_BREAKPOINT __asm__("int $0x03")
#elif defined(__has_builtin)
#if __has_builtin(__builtin_debugtrap)
#define RE_BREAKPOINT __builtin_debugtrap()
#endif
#endif
#ifndef RE_BREAKPOINT
#define RE_BREAKPOINT
#endifThere was a problem hiding this comment.
I'll have an eye on the validation run
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Works as expected on MacOS with clang