diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-02-02 11:46:41 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-02-02 11:46:41 -0800 |
| commit | e21ea0ad23f299e3f0a4b8584781fc9d6dab5315 (patch) | |
| tree | b057fc1e8261fcf9b024a3da8896ea694d1e9e06 | |
| parent | e4af8610170cf6c8eaa21bca67b2874101de1616 (diff) | |
| parent | f4b079d04633c24b38e364c3592daf3b8c4ed69a (diff) | |
| download | coreclr-e21ea0ad23f299e3f0a4b8584781fc9d6dab5315.tar.gz coreclr-e21ea0ad23f299e3f0a4b8584781fc9d6dab5315.tar.bz2 coreclr-e21ea0ad23f299e3f0a4b8584781fc9d6dab5315.zip | |
Merge pull request #2941 from krytarowski/netbsd-support-19
Add support for NetBSD-style gregs on x86
| -rw-r--r-- | src/pal/src/config.h.in | 1 | ||||
| -rw-r--r-- | src/pal/src/configure.cmake | 1 | ||||
| -rw-r--r-- | src/pal/src/include/pal/context.h | 43 |
3 files changed, 44 insertions, 1 deletions
diff --git a/src/pal/src/config.h.in b/src/pal/src/config.h.in index b4fc976ed3..204c5ff380 100644 --- a/src/pal/src/config.h.in +++ b/src/pal/src/config.h.in @@ -62,6 +62,7 @@ #cmakedefine01 HAVE_BSD_REGS_T #cmakedefine01 HAVE_PT_REGS #cmakedefine01 HAVE_GREGSET_T +#cmakedefine01 HAVE___GREGSET_T #cmakedefine01 HAVE_SIGINFO_T #cmakedefine01 HAVE_UCONTEXT_T #cmakedefine01 HAVE_PTHREAD_RWLOCK_T diff --git a/src/pal/src/configure.cmake b/src/pal/src/configure.cmake index dd5ff09fd8..8e5eb307f7 100644 --- a/src/pal/src/configure.cmake +++ b/src/pal/src/configure.cmake @@ -80,6 +80,7 @@ check_struct_has_member ("struct stat" st_atimespec "sys/types.h;sys/stat.h" HAV check_struct_has_member ("struct stat" st_atimensec "sys/types.h;sys/stat.h" HAVE_STAT_NSEC) check_struct_has_member ("struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF) check_struct_has_member ("ucontext_t" uc_mcontext.gregs[0] ucontext.h HAVE_GREGSET_T) +check_struct_has_member ("ucontext_t" uc_mcontext.__gregs[0] ucontext.h HAVE___GREGSET_T) set(CMAKE_EXTRA_INCLUDE_FILES machine/reg.h) check_type_size("struct reg" BSD_REGS_T) diff --git a/src/pal/src/include/pal/context.h b/src/pal/src/include/pal/context.h index 5785388b4a..87649696d7 100644 --- a/src/pal/src/include/pal/context.h +++ b/src/pal/src/include/pal/context.h @@ -44,7 +44,48 @@ typedef ucontext_t native_context_t; #include <mach/mach_port.h> #endif // !HAVE_MACH_EXCEPTIONS else -#if HAVE_GREGSET_T +#if HAVE___GREGSET_T + +#ifdef BIT64 +#define MCREG_Rbx(mc) ((mc).__gregs[_REG_RBX]) +#define MCREG_Rcx(mc) ((mc).__gregs[_REG_RCX]) +#define MCREG_Rdx(mc) ((mc).__gregs[_REG_RDX]) +#define MCREG_Rsi(mc) ((mc).__gregs[_REG_RSI]) +#define MCREG_Rdi(mc) ((mc).__gregs[_REG_RDI]) +#define MCREG_Rbp(mc) ((mc).__gregs[_REG_RBP]) +#define MCREG_Rax(mc) ((mc).__gregs[_REG_RAX]) +#define MCREG_Rip(mc) ((mc).__gregs[_REG_RIP]) +#define MCREG_Rsp(mc) ((mc).__gregs[_REG_RSP]) +#define MCREG_SegCs(mc) ((mc).__gregs[_REG_CS]) +#define MCREG_SegSs(mc) ((mc).__gregs[_REG_SS]) +#define MCREG_R8(mc) ((mc).__gregs[_REG_R8]) +#define MCREG_R9(mc) ((mc).__gregs[_REG_R9]) +#define MCREG_R10(mc) ((mc).__gregs[_REG_R10]) +#define MCREG_R11(mc) ((mc).__gregs[_REG_R11]) +#define MCREG_R12(mc) ((mc).__gregs[_REG_R12]) +#define MCREG_R13(mc) ((mc).__gregs[_REG_R13]) +#define MCREG_R14(mc) ((mc).__gregs[_REG_R14]) +#define MCREG_R15(mc) ((mc).__gregs[_REG_R15]) +#define MCREG_EFlags(mc) ((mc).__gregs[_REG_RFLAGS]) + +#else // BIT64 + +#define MCREG_Ebx(mc) ((mc).__gregs[_REG_EBX]) +#define MCREG_Ecx(mc) ((mc).__gregs[_REG_ECX]) +#define MCREG_Edx(mc) ((mc).__gregs[_REG_EDX]) +#define MCREG_Esi(mc) ((mc).__gregs[_REG_ESI]) +#define MCREG_Edi(mc) ((mc).__gregs[_REG_EDI]) +#define MCREG_Ebp(mc) ((mc).__gregs[_REG_EBP]) +#define MCREG_Eax(mc) ((mc).__gregs[_REG_EAX]) +#define MCREG_Eip(mc) ((mc).__gregs[_REG_EIP]) +#define MCREG_Esp(mc) ((mc).__gregs[_REG_ESP]) +#define MCREG_SegCs(mc) ((mc).__gregs[_REG_CS]) +#define MCREG_SegSs(mc) ((mc).__gregs[_REG_SS]) +#define MCREG_EFlags(mc) ((mc).__gregs[_REG_RFLAGS]) + +#endif // BIT64 + +#elif HAVE_GREGSET_T #ifdef BIT64 #define MCREG_Rbx(mc) ((mc).gregs[REG_RBX]) |