RepoMirrors/gperftools
1
0
Fork 0
mirror of https://github.com/gperftools/gperftools synced 2025-01-31 03:31:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issues with heap checker on PPC64 LE.

Browse Source 
Fixed the wrapper for the syscall sys_clone and the test for heap
checker on PPC64 LE. Both use the ODP structure, which is only
used on BE architectures.
This commit is contained in:
Raphael Moreira Zinsly 2014-04-08 17:43:11 -03:00 committed by Aliaksey Kandratsenka
parent 49237462c8
commit 9d5e1a0aa5
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/base/linux_syscall_support.h
View File

@ -1810,6 +1810,17 @@ struct kernel_stat {
long __ret, __err;
{
#if defined(__PPC64__)
/* Stack frame offsets. */
#if _CALL_ELF != 2
#define FRAME_MIN_SIZE 112
#define FRAME_TOC_SAVE 40
#else
#define FRAME_MIN_SIZE 32
#define FRAME_TOC_SAVE 24
#endif
register int (*__fn)(void *) __asm__ ("r3") = fn;
register void *__cstack __asm__ ("r4") = child_stack;
register int __flags __asm__ ("r5") = flags;
@ -1829,7 +1840,7 @@ struct kernel_stat {
/* set up stack frame for child */
"clrrdi %7, %7, 4\n\t"
"li 0, 0\n\t"
"stdu 0, -112(%7)\n\t"
"stdu 0, -%13(%7)\n\t"
/* fn, arg, child_stack are saved acrVoss the syscall */
"mr 28, %6\n\t"
@ -1855,13 +1866,18 @@ struct kernel_stat {
"bne- cr1, 1f\n\t"
/* Do the function call */
"std 2, 40(1)\n\t"
"std 2, %14(1)\n\t"
#if _CALL_ELF != 2
"ld 0, 0(28)\n\t"
"ld 2, 8(28)\n\t"
"mtctr 0\n\t"
#else
"mr 12, 28\n\t"
"mtctr 12\n\t"
#endif
"mr 3, 27\n\t"
"bctrl\n\t"
"ld 2, 40(1)\n\t"
"ld 2, %14(1)\n\t"
/* Call _exit(r3) */
"li 0, %5\n\t"
@ -1875,7 +1891,7 @@ struct kernel_stat {
"i" (__NR_clone), "i" (__NR_exit),
"r" (__fn), "r" (__cstack), "r" (__flags),
"r" (__arg), "r" (__ptidptr), "r" (__newtls),
"r" (__ctidptr)
"r" (__ctidptr), "i" (FRAME_MIN_SIZE), "i" (FRAME_TOC_SAVE)
: "cr0", "cr1", "memory", "ctr",
"r0", "r29", "r27", "r28");
#else

2
src/tests/heap-checker_unittest.cc
View File

@ -1267,7 +1267,7 @@ static void* Mmapper(uintptr_t* addr_after_mmap_call) {
// On PPC64 the stacktrace returned by GetStatcTrace contains the function
// address from .text segment while function pointers points to ODP entries.
// The following code decodes the ODP to get the actual symbol address.
#if defined(__linux) && defined(__PPC64__)
#if defined(__linux) && defined(__PPC64__) && (_CALL_ELF != 2)
static inline uintptr_t GetFunctionAddress (void* (*func)(uintptr_t*))
{
struct odp_entry_t {