diff options
| author | Raphael Moreira Zinsly <rzinsly@linux.vnet.ibm.com> | 2014-04-08 17:43:11 -0300 |
|---|---|---|
| committer | Aliaksey Kandratsenka <alk@tut.by> | 2014-04-12 11:14:43 -0700 |
| commit | 9d5e1a0aa5a6ad1c7af18b65016fa5c9b7fccb47 (patch) | |
| tree | 2f1d7585c594ad02beecf9e82640762d69ce748f | |
| parent | 49237462c8ae7920332c1034c623e57b50a6109c (diff) | |
| download | gperftools-9d5e1a0aa5a6ad1c7af18b65016fa5c9b7fccb47.tar.gz | |
Fixed issues with heap checker on PPC64 LE.
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.
| -rw-r--r-- | src/base/linux_syscall_support.h | 24 | ||||
| -rw-r--r-- | src/tests/heap-checker_unittest.cc | 2 |
2 files changed, 21 insertions, 5 deletions
diff --git a/src/base/linux_syscall_support.h b/src/base/linux_syscall_support.h index cb62618..9b6c35d 100644 --- a/src/base/linux_syscall_support.h +++ b/src/base/linux_syscall_support.h @@ -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 diff --git a/src/tests/heap-checker_unittest.cc b/src/tests/heap-checker_unittest.cc index b4e95f3..13cbb86 100644 --- a/src/tests/heap-checker_unittest.cc +++ b/src/tests/heap-checker_unittest.cc @@ -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 { |