riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

osx fixes

Browse Source
This commit is contained in:
Ludwig Ortmann 2014-01-21 12:22:55 +01:00
parent caa947dcec
commit 98a2d554b5
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpu/native/irq_cpu.c
View File

@ -319,6 +319,7 @@ void native_isr_entry(int sig, siginfo_t *info, void *context)
if (_native_in_syscall == 0) { if (_native_in_syscall == 0) {
DEBUG("\n\n\t\treturn to _native_sig_leave_tramp\n\n"); DEBUG("\n\n\t\treturn to _native_sig_leave_tramp\n\n");
#ifdef __MACH__ #ifdef __MACH__
isr_set_sigmask((ucontext_t *)context);
_native_in_isr = 1; _native_in_isr = 1;
_native_saved_eip = ((ucontext_t *)context)->uc_mcontext->__ss.__eip; _native_saved_eip = ((ucontext_t *)context)->uc_mcontext->__ss.__eip;
((ucontext_t *)context)->uc_mcontext->__ss.__eip = (unsigned int)&_native_sig_leave_tramp; ((ucontext_t *)context)->uc_mcontext->__ss.__eip = (unsigned int)&_native_sig_leave_tramp;

2
cpu/native/tramp.S
View File

@ -11,6 +11,8 @@ __native_sig_leave_tramp:
call _swapcontext call _swapcontext
addl $8, %esp addl $8, %esp
call _eINT
movl $0x0, __native_in_isr movl $0x0, __native_in_isr
popa popa
popf popf