#include "utils/mono-sigcontext.h"
#include "mach-support.h"
+//For reg numbers
+#include <mono/arch/amd64/amd64-codegen.h>
+
/* Known offsets used for TLS storage*/
/* All OSX versions up to 10.8 */
#define TLS_VECTOR_OFFSET_CATS 0x60
#define TLS_VECTOR_OFFSET_10_9 0xe0
+#define TLS_VECTOR_OFFSET_10_11 0x100
+
+/* This is 2 slots less than the known low */
+#define TLS_PROBE_LOW_WATERMARK 0x50
+/* This is 28 slots above the know high, which is more than the known high-low*/
+#define TLS_PROBE_HIGH_WATERMARK 0x200
+
static int tls_vector_offset;
*arch_state = ctx->__ss;
}
+void
+mono_mach_arch_thread_state_to_mono_context (thread_state_t state, MonoContext *context)
+{
+ x86_thread_state64_t *arch_state = (x86_thread_state64_t *) state;
+ context->gregs [AMD64_RAX] = arch_state->__rax;
+ context->gregs [AMD64_RBX] = arch_state->__rbx;
+ context->gregs [AMD64_RCX] = arch_state->__rcx;
+ context->gregs [AMD64_RDX] = arch_state->__rdx;
+ context->gregs [AMD64_RDI] = arch_state->__rdi;
+ context->gregs [AMD64_RBP] = arch_state->__rbp;
+ context->gregs [AMD64_RSP] = arch_state->__rsp;
+ context->gregs [AMD64_R8] = arch_state->__r8;
+ context->gregs [AMD64_R9] = arch_state->__r9;
+ context->gregs [AMD64_R10] = arch_state->__r10;
+ context->gregs [AMD64_R11] = arch_state->__r11;
+ context->gregs [AMD64_R12] = arch_state->__r12;
+ context->gregs [AMD64_R13] = arch_state->__r13;
+ context->gregs [AMD64_R14] = arch_state->__r14;
+ context->gregs [AMD64_R15] = arch_state->__r15;
+ context->gregs [AMD64_RIP] = arch_state->__rip;
+}
+
int
mono_mach_arch_get_thread_state_size ()
{
*/
intptr_t *p = (intptr_t *)thread;
intptr_t **tsd = (intptr_t **) ((char*)p + tls_vector_offset);
+ g_assert (tls_vector_offset != -1);
return (void *) &tsd [key];
}
void
mono_mach_init (pthread_key_t key)
{
+ int i;
void *old_value = pthread_getspecific (key);
void *canary = (void*)0xDEADBEEFu;
if (mono_mach_arch_get_tls_value_from_thread (pthread_self (), key) == canary)
goto ok;
- g_error ("could not discover the mach TLS offset");
+ tls_vector_offset = TLS_VECTOR_OFFSET_10_11;
+ if (mono_mach_arch_get_tls_value_from_thread (pthread_self (), key) == canary)
+ goto ok;
+
+ /*Fallback to scanning a large range of offsets*/
+ for (i = TLS_PROBE_LOW_WATERMARK; i <= TLS_PROBE_HIGH_WATERMARK; i += 4) {
+ tls_vector_offset = i;
+ if (mono_mach_arch_get_tls_value_from_thread (pthread_self (), key) == canary) {
+ g_warning ("Found new TLS offset at %d", i);
+ goto ok;
+ }
+ }
+
+ tls_vector_offset = -1;
+ g_warning ("could not discover the mach TLS offset");
ok:
pthread_setspecific (key, old_value);
}