projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert r145180 as it is causing test failures on all the bots.
[oota-llvm.git]
/
lib
/
Object
/
COFFObjectFile.cpp
diff --git
a/lib/Object/COFFObjectFile.cpp
b/lib/Object/COFFObjectFile.cpp
index 8344ca071d34faa42d57e0e91d2d1ef5f4780d0a..c6ce56221a555ee0e2fecb20915989fdc94adc49 100644
(file)
--- a/
lib/Object/COFFObjectFile.cpp
+++ b/
lib/Object/COFFObjectFile.cpp
@@
-101,7
+101,7
@@
error_code COFFObjectFile::getSymbolNext(DataRefImpl Symb,
return getSymbolName(symb, Result);
}
return getSymbolName(symb, Result);
}
-error_code COFFObjectFile::getSymbol
File
Offset(DataRefImpl Symb,
+error_code COFFObjectFile::getSymbolOffset(DataRefImpl Symb,
uint64_t &Result) const {
const coff_symbol *symb = toSymb(Symb);
const coff_section *Section = NULL;
uint64_t &Result) const {
const coff_symbol *symb = toSymb(Symb);
const coff_section *Section = NULL;
@@
-113,7
+113,7
@@
error_code COFFObjectFile::getSymbolFileOffset(DataRefImpl Symb,
if (Type == 'U' || Type == 'w')
Result = UnknownAddressOrSize;
else if (Section)
if (Type == 'U' || Type == 'w')
Result = UnknownAddressOrSize;
else if (Section)
- Result = Section->
PointerToRawData
+ symb->Value;
+ Result = Section->
VirtualAddress
+ symb->Value;
else
Result = symb->Value;
return object_error::success;
else
Result = symb->Value;
return object_error::success;
@@
-131,9
+131,11
@@
error_code COFFObjectFile::getSymbolAddress(DataRefImpl Symb,
if (Type == 'U' || Type == 'w')
Result = UnknownAddressOrSize;
else if (Section)
if (Type == 'U' || Type == 'w')
Result = UnknownAddressOrSize;
else if (Section)
- Result = Section->VirtualAddress + symb->Value;
+ Result = reinterpret_cast<uintptr_t>(base() +
+ Section->PointerToRawData +
+ symb->Value);
else
else
- Result =
symb->Value
;
+ Result =
reinterpret_cast<uintptr_t>(base() + symb->Value)
;
return object_error::success;
}
return object_error::success;
}
@@
-622,11
+624,6
@@
error_code COFFObjectFile::getRelocationAddress(DataRefImpl Rel,
Res = toRel(Rel)->VirtualAddress;
return object_error::success;
}
Res = toRel(Rel)->VirtualAddress;
return object_error::success;
}
-error_code COFFObjectFile::getRelocationOffset(DataRefImpl Rel,
- uint64_t &Res) const {
- Res = toRel(Rel)->VirtualAddress;
- return object_error::success;
-}
error_code COFFObjectFile::getRelocationSymbol(DataRefImpl Rel,
SymbolRef &Res) const {
const coff_relocation* R = toRel(Rel);
error_code COFFObjectFile::getRelocationSymbol(DataRefImpl Rel,
SymbolRef &Res) const {
const coff_relocation* R = toRel(Rel);