projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #5714 from alexischr/update_bockbuild
[mono.git]
/
mono
/
mini
/
mini-darwin.c
diff --git
a/mono/mini/mini-darwin.c
b/mono/mini/mini-darwin.c
index 75e0a8800fb7531a7083f293f0989b5f44de37ff..aca60d498f487a1cd60bd8c6fada8741d10ebff4 100644
(file)
--- a/
mono/mini/mini-darwin.c
+++ b/
mono/mini/mini-darwin.c
@@
-34,7
+34,6
@@
#include <mono/metadata/threads.h>
#include <mono/metadata/appdomain.h>
#include <mono/metadata/debug-helpers.h>
#include <mono/metadata/threads.h>
#include <mono/metadata/appdomain.h>
#include <mono/metadata/debug-helpers.h>
-#include "mono/metadata/profiler.h"
#include <mono/metadata/profiler-private.h>
#include <mono/metadata/mono-config.h>
#include <mono/metadata/environment.h>
#include <mono/metadata/profiler-private.h>
#include <mono/metadata/mono-config.h>
#include <mono/metadata/environment.h>
@@
-101,8
+100,6
@@
mono_thread_state_init_from_handle (MonoThreadUnwindState *tctx, MonoThreadInfo
kern_return_t ret;
mach_msg_type_number_t num_state, num_fpstate;
thread_state_t state, fpstate;
kern_return_t ret;
mach_msg_type_number_t num_state, num_fpstate;
thread_state_t state, fpstate;
- ucontext_t ctx;
- mcontext_t mctx;
MonoJitTlsData *jit_tls;
void *domain;
MonoLMF *lmf = NULL;
MonoJitTlsData *jit_tls;
void *domain;
MonoLMF *lmf = NULL;
@@
-117,7
+114,6
@@
mono_thread_state_init_from_handle (MonoThreadUnwindState *tctx, MonoThreadInfo
state = (thread_state_t) alloca (mono_mach_arch_get_thread_state_size ());
fpstate = (thread_state_t) alloca (mono_mach_arch_get_thread_fpstate_size ());
state = (thread_state_t) alloca (mono_mach_arch_get_thread_state_size ());
fpstate = (thread_state_t) alloca (mono_mach_arch_get_thread_fpstate_size ());
- mctx = (mcontext_t) alloca (mono_mach_arch_get_mcontext_size ());
do {
ret = mono_mach_arch_get_thread_states (info->native_handle, state, &num_state, fpstate, &num_fpstate);
do {
ret = mono_mach_arch_get_thread_states (info->native_handle, state, &num_state, fpstate, &num_fpstate);
@@
-125,10
+121,7
@@
mono_thread_state_init_from_handle (MonoThreadUnwindState *tctx, MonoThreadInfo
if (ret != KERN_SUCCESS)
return FALSE;
if (ret != KERN_SUCCESS)
return FALSE;
- mono_mach_arch_thread_states_to_mcontext (state, fpstate, mctx);
- ctx.uc_mcontext = mctx;
-
- mono_sigctx_to_monoctx (&ctx, &tctx->ctx);
+ mono_mach_arch_thread_states_to_mono_context (state, fpstate, &tctx->ctx);
/* mono_set_jit_tls () sets this */
jit_tls = mono_thread_info_tls_get (info, TLS_KEY_JIT_TLS);
/* mono_set_jit_tls () sets this */
jit_tls = mono_thread_info_tls_get (info, TLS_KEY_JIT_TLS);