drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes for linux64

Browse Source
This commit is contained in:
castano 2007-06-17 06:47:36 +00:00
parent acbebcc444
commit c4c6b95a50
2 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
src/nvcore/Debug.cpp
View File

@ -161,60 +161,60 @@ namespace
} }
#endif // defined(HAVE_EXECINFO_H) #endif // defined(HAVE_EXECINFO_H)
static void * callerAddress(void * secret) static void * callerAddress(void * secret)
{ {
# if NV_OS_DARWIN && NV_CPU_PPC # if NV_OS_DARWIN && NV_CPU_PPC
ucontext_t * ucp = (ucontext_t *)secret; ucontext_t * ucp = (ucontext_t *)secret;
return (void *) ucp->uc_mcontext->ss.srr0; return (void *) ucp->uc_mcontext->ss.srr0;
# elif NV_OS_DARWIN && NV_CPU_X86 # elif NV_OS_DARWIN && NV_CPU_X86
ucontext_t * ucp = (ucontext_t *)secret; ucontext_t * ucp = (ucontext_t *)secret;
return (void *) ucp->uc_mcontext->ss.eip; return (void *) ucp->uc_mcontext->ss.eip;
# elif NV_CPU_X86_64 # elif NV_CPU_X86_64
// #define REG_RIP REG_INDEX(rip) // seems to be 16 // #define REG_RIP REG_INDEX(rip) // seems to be 16
ucontext_t * ucp = (ucontext_t *)secret; ucontext_t * ucp = (ucontext_t *)secret;
return (void *)ucp->uc_mcontext.gregs[REG_RIP]; return (void *)ucp->uc_mcontext.gregs[REG_RIP];
# elif NV_CPU_X86 # elif NV_CPU_X86
ucontext_t * ucp = (ucontext_t *)secret; ucontext_t * ucp = (ucontext_t *)secret;
return (void *)ucp->uc_mcontext.gregs[REG_EIP]; // 14 return (void *)ucp->uc_mcontext.gregs[14/*REG_EIP*/];
# elif NV_CPU_PPC # elif NV_CPU_PPC
ucontext_t * ucp = (ucontext_t *)secret; ucontext_t * ucp = (ucontext_t *)secret;
return (void *) ucp->uc_mcontext.regs->nip; return (void *) ucp->uc_mcontext.regs->nip;
# else # else
return NULL; return NULL;
# endif # endif
// How to obtain the instruction pointers in different platforms, from mlton's source code. // How to obtain the instruction pointers in different platforms, from mlton's source code.
// http://mlton.org/ // http://mlton.org/
// OpenBSD && NetBSD // OpenBSD && NetBSD
// ucp->sc_eip // ucp->sc_eip
// FreeBSD: // FreeBSD:
// ucp->uc_mcontext.mc_eip // ucp->uc_mcontext.mc_eip
// HPUX: // HPUX:
// ucp->uc_link // ucp->uc_link
// Solaris: // Solaris:
// ucp->uc_mcontext.gregs[REG_PC] // ucp->uc_mcontext.gregs[REG_PC]
// Linux hppa: // Linux hppa:
// uc->uc_mcontext.sc_iaoq[0] & ~0×3UL // uc->uc_mcontext.sc_iaoq[0] & ~0×3UL
// Linux sparc: // Linux sparc:
// ((struct sigcontext*) secret)->sigc_regs.tpc // ((struct sigcontext*) secret)->sigc_regs.tpc
// Linux sparc64: // Linux sparc64:
// ((struct sigcontext*) secret)->si_regs.pc // ((struct sigcontext*) secret)->si_regs.pc
// potentially correct for other archs: // potentially correct for other archs:
// Linux alpha: ucp->m_context.sc_pc // Linux alpha: ucp->m_context.sc_pc
// Linux arm: ucp->m_context.ctx.arm_pc // Linux arm: ucp->m_context.ctx.arm_pc
// Linux ia64: ucp->m_context.sc_ip & ~0×3UL // Linux ia64: ucp->m_context.sc_ip & ~0×3UL
// Linux mips: ucp->m_context.sc_pc // Linux mips: ucp->m_context.sc_pc
// Linux s390: ucp->m_context.sregs->regs.psw.addr // Linux s390: ucp->m_context.sregs->regs.psw.addr
} }
static void nvSigHandler(int sig, siginfo_t *info, void *secret) static void nvSigHandler(int sig, siginfo_t *info, void *secret)
{ {
void * pnt = callerAddress(secret); void * pnt = callerAddress(secret);
// Do something useful with siginfo_t // Do something useful with siginfo_t
if (sig == SIGSEGV) { if (sig == SIGSEGV) {
if (pnt != NULL) nvDebug("Got signal %d, faulty address is %p, from %p\n", sig, info->si_addr, pnt); if (pnt != NULL) nvDebug("Got signal %d, faulty address is %p, from %p\n", sig, info->si_addr, pnt);
else nvDebug("Got signal %d, faulty address is %p\n", sig, info->si_addr); else nvDebug("Got signal %d, faulty address is %p\n", sig, info->si_addr);
} }
@ -231,9 +231,9 @@ namespace
int size = backtrace(trace, 64); int size = backtrace(trace, 64);
if (pnt != NULL) { if (pnt != NULL) {
// Overwrite sigaction with caller's address. // Overwrite sigaction with caller's address.
ucontext_t * uc = (ucontext_t *)secret; ucontext_t * uc = (ucontext_t *)secret;
trace[1] = (void *) uc->uc_mcontext.gregs[REG_EIP]; trace[1] = pnt;
} }
nvPrintStackTrace(trace, size, 1); nvPrintStackTrace(trace, size, 1);
@ -469,7 +469,7 @@ void debug::enableSigHandler()
struct sigaction sa; struct sigaction sa;
sa.sa_sigaction = nvSigHandler; sa.sa_sigaction = nvSigHandler;
sigemptyset (&sa.sa_mask); sigemptyset (&sa.sa_mask);
sa.sa_flags = SA_ONSTACK | SA_RESTART | SA_SIGINFO; sa.sa_flags = SA_ONSTACK | SA_RESTART | SA_SIGINFO;
sigaction(SIGSEGV, &sa, &s_old_sigsegv); sigaction(SIGSEGV, &sa, &s_old_sigsegv);
sigaction(SIGTRAP, &sa, &s_old_sigtrap); sigaction(SIGTRAP, &sa, &s_old_sigtrap);

2
src/nvcore/Debug.h
View File

@ -67,7 +67,7 @@
#endif // NV_NO_ASSERT #endif // NV_NO_ASSERT
// Use nvAssume for very simple expresions only: piAssume(0), piAssume(value == true), etc. // Use nvAssume for very simple expresions only: nvAssume(0), nvAssume(value == true), etc.
#if defined(_DEBUG) #if defined(_DEBUG)
# if NV_CC_MSVC # if NV_CC_MSVC
# define nvAssume(exp) __assume(exp) # define nvAssume(exp) __assume(exp)