|
From: <sv...@va...> - 2010-01-01 12:52:10
|
Author: sewardj
Date: 2010-01-01 12:44:12 +0000 (Fri, 01 Jan 2010)
New Revision: 10983
Log:
n-break build on x86-darwin following r10982.
Modified:
trunk/coregrind/m_cpuid.S
trunk/coregrind/m_signals.c
Modified: trunk/coregrind/m_cpuid.S
===================================================================
--- trunk/coregrind/m_cpuid.S 2010-01-01 11:59:33 UTC (rev 10982)
+++ trunk/coregrind/m_cpuid.S 2010-01-01 12:44:12 UTC (rev 10983)
@@ -149,7 +149,7 @@
ret
#endif
-#if defined(VGA_x86) || defined(VGA_amd64)
+#if defined(VGP_x86_linux) || defined(VGP_amd64_linux)
/* Let the linker know we don't need an executable stack */
.section .note.GNU-stack,"",@progbits
#endif
Modified: trunk/coregrind/m_signals.c
===================================================================
--- trunk/coregrind/m_signals.c 2010-01-01 11:59:33 UTC (rev 10982)
+++ trunk/coregrind/m_signals.c 2010-01-01 12:44:12 UTC (rev 10983)
@@ -54,7 +54,7 @@
a signal with kill, its expected to be synchronous: ie, the signal
will have been delivered by the time the syscall finishes.
- 4. Asyncronous, general signals. All other signals, sent by
+ 4. Asynchronous, general signals. All other signals, sent by
another process with kill. These are generally blocked, except for
two special cases: we poll for them each time we're about to run a
thread for a time quanta, and while running blocking syscalls.
@@ -490,14 +490,15 @@
return VG_(mk_SysRes_x86_darwin)( scclass, err ? True : False,
wHI, wLO );
}
- static inline Addr VG_UCONTEXT_LINK_REG( void* ucV ) {
- return 0; /* No, really. We have no LRs today. */
- }
- static inline Addr VG_UCONTEXT_FRAME_PTR( void* ucV ) {
- ucontext_t* uc = (ucontext_t*)ucV;
+ static inline
+ void VG_UCONTEXT_TO_UnwindStartRegs( UnwindStartRegs* srP,
+ void* ucV ) {
+ ucontext_t* uc = (ucontext_t*)(ucV);
struct __darwin_mcontext32* mc = uc->uc_mcontext;
struct __darwin_i386_thread_state* ss = &mc->__ss;
- return ss->__ebp;
+ srP->r_pc = (ULong)(ss->__eip);
+ srP->r_sp = (ULong)(ss->__esp);
+ srP->misc.X86.r_ebp = (UInt)(ss->__ebp);
}
#elif defined(VGP_amd64_darwin)
|