projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c889057
)
[runtime] Avoid indirection when building MonoContext on darwin
author
Vlad Brezae
<brezaevlad@gmail.com>
Mon, 25 Sep 2017 20:14:19 +0000
(23:14 +0300)
committer
Vlad Brezae
<brezaevlad@gmail.com>
Wed, 27 Sep 2017 18:30:42 +0000
(21:30 +0300)
mono/mini/mini-darwin.c
patch
|
blob
|
history
diff --git
a/mono/mini/mini-darwin.c
b/mono/mini/mini-darwin.c
index 73be22c7c6e91d531b43f47c54efdeb9be0424ec..aca60d498f487a1cd60bd8c6fada8741d10ebff4 100644
(file)
--- a/
mono/mini/mini-darwin.c
+++ b/
mono/mini/mini-darwin.c
@@
-100,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;
@@
-116,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);
@@
-124,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);