提交 5a194d8e 编写于 作者: S simonis

8206173: MallocSiteTable::initialize() doesn't take function descriptors into account

Reviewed-by: stuefe, zgu
上级 5935076b
...@@ -84,12 +84,18 @@ bool MallocSiteTable::initialize() { ...@@ -84,12 +84,18 @@ bool MallocSiteTable::initialize() {
// Create pseudo call stack for hashtable entry allocation // Create pseudo call stack for hashtable entry allocation
address pc[3]; address pc[3];
if (NMT_TrackingStackDepth >= 3) { if (NMT_TrackingStackDepth >= 3) {
pc[2] = (address)MallocSiteTable::allocation_at; uintx *fp = (uintx*)MallocSiteTable::allocation_at;
// On ppc64, 'fp' is a pointer to a function descriptor which is a struct of
// three native pointers where the first pointer is the real function address.
// See: http://refspecs.linuxfoundation.org/ELF/ppc64/PPC-elf64abi-1.9.html#FUNC-DES
pc[2] = (address)(fp PPC64_ONLY(BIG_ENDIAN_ONLY([0])));
} }
if (NMT_TrackingStackDepth >= 2) { if (NMT_TrackingStackDepth >= 2) {
pc[1] = (address)MallocSiteTable::lookup_or_add; uintx *fp = (uintx*)MallocSiteTable::lookup_or_add;
pc[1] = (address)(fp PPC64_ONLY(BIG_ENDIAN_ONLY([0])));
} }
pc[0] = (address)MallocSiteTable::new_entry; uintx *fp = (uintx*)MallocSiteTable::new_entry;
pc[0] = (address)(fp PPC64_ONLY(BIG_ENDIAN_ONLY([0])));
// Instantiate NativeCallStack object, have to use placement new operator. (see comments above) // Instantiate NativeCallStack object, have to use placement new operator. (see comments above)
NativeCallStack* stack = ::new ((void*)_hash_entry_allocation_stack) NativeCallStack* stack = ::new ((void*)_hash_entry_allocation_stack)
......
...@@ -416,6 +416,14 @@ ...@@ -416,6 +416,14 @@
#define NOT_EMBEDDED(code) code #define NOT_EMBEDDED(code) code
#endif #endif
#ifdef VM_LITTLE_ENDIAN
#define LITTLE_ENDIAN_ONLY(code) code
#define BIG_ENDIAN_ONLY(code)
#else
#define LITTLE_ENDIAN_ONLY(code)
#define BIG_ENDIAN_ONLY(code) code
#endif
#define define_pd_global(type, name, value) const type pd_##name = value; #define define_pd_global(type, name, value) const type pd_##name = value;
#endif // SHARE_VM_UTILITIES_MACROS_HPP #endif // SHARE_VM_UTILITIES_MACROS_HPP
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册