--- a/hotspot/src/share/vm/utilities/elfSymbolTable.cpp Wed Nov 27 16:16:21 2013 -0800
+++ b/hotspot/src/share/vm/utilities/elfSymbolTable.cpp Thu Dec 05 19:19:09 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
#if !defined(_WINDOWS) && !defined(__APPLE__)
#include "memory/allocation.inline.hpp"
+#include "utilities/elfFuncDescTable.hpp"
#include "utilities/elfSymbolTable.hpp"
ElfSymbolTable::ElfSymbolTable(FILE* file, Elf_Shdr shdr) {
@@ -68,7 +69,7 @@
}
}
-bool ElfSymbolTable::lookup(address addr, int* stringtableIndex, int* posIndex, int* offset) {
+bool ElfSymbolTable::lookup(address addr, int* stringtableIndex, int* posIndex, int* offset, ElfFuncDescTable* funcDescTable) {
assert(stringtableIndex, "null string table index pointer");
assert(posIndex, "null string table offset pointer");
assert(offset, "null offset pointer");
@@ -77,19 +78,25 @@
return false;
}
- address pc = 0;
size_t sym_size = sizeof(Elf_Sym);
assert((m_shdr.sh_size % sym_size) == 0, "check size");
int count = m_shdr.sh_size / sym_size;
if (m_symbols != NULL) {
for (int index = 0; index < count; index ++) {
if (STT_FUNC == ELF_ST_TYPE(m_symbols[index].st_info)) {
- address sym_addr = (address)m_symbols[index].st_value;
- if (sym_addr < addr && (addr - sym_addr) < *offset) {
- pc = (address)m_symbols[index].st_value;
- *offset = (int)(addr - pc);
+ Elf_Word st_size = m_symbols[index].st_size;
+ address sym_addr;
+ if (funcDescTable != NULL && funcDescTable->get_index() == m_symbols[index].st_shndx) {
+ // We need to go another step trough the function descriptor table (currently PPC64 only)
+ sym_addr = funcDescTable->lookup(m_symbols[index].st_value);
+ } else {
+ sym_addr = (address)m_symbols[index].st_value;
+ }
+ if (sym_addr <= addr && (Elf_Word)(addr - sym_addr) < st_size) {
+ *offset = (int)(addr - sym_addr);
*posIndex = m_symbols[index].st_name;
*stringtableIndex = m_shdr.sh_link;
+ return true;
}
}
}
@@ -105,12 +112,19 @@
for (int index = 0; index < count; index ++) {
if (fread(&sym, sym_size, 1, m_file) == 1) {
if (STT_FUNC == ELF_ST_TYPE(sym.st_info)) {
- address sym_addr = (address)sym.st_value;
- if (sym_addr < addr && (addr - sym_addr) < *offset) {
- pc = (address)sym.st_value;
- *offset = (int)(addr - pc);
+ Elf_Word st_size = sym.st_size;
+ address sym_addr;
+ if (funcDescTable != NULL && funcDescTable->get_index() == sym.st_shndx) {
+ // We need to go another step trough the function descriptor table (currently PPC64 only)
+ sym_addr = funcDescTable->lookup(sym.st_value);
+ } else {
+ sym_addr = (address)sym.st_value;
+ }
+ if (sym_addr <= addr && (Elf_Word)(addr - sym_addr) < st_size) {
+ *offset = (int)(addr - sym_addr);
*posIndex = sym.st_name;
*stringtableIndex = m_shdr.sh_link;
+ return true;
}
}
} else {
@@ -123,4 +137,4 @@
return true;
}
-#endif // _WINDOWS
+#endif // !_WINDOWS && !__APPLE__