diff options
Diffstat (limited to 'bindings/python/llvm/object.py')
| -rw-r--r-- | bindings/python/llvm/object.py | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/bindings/python/llvm/object.py b/bindings/python/llvm/object.py index 473aa3a..4e912ed 100644 --- a/bindings/python/llvm/object.py +++ b/bindings/python/llvm/object.py @@ -78,7 +78,10 @@ Here are some examples on how to perform iteration: """ from ctypes import c_char_p +from ctypes import c_char +from ctypes import POINTER from ctypes import c_uint64 +from ctypes import string_at from .common import CachedProperty from .common import LLVMObject @@ -211,7 +214,12 @@ class Section(LLVMObject): if self.expired: raise Exception('Section instance has expired.') - return lib.LLVMGetSectionContents(self) + siz = self.size + + r = lib.LLVMGetSectionContents(self) + if r: + return string_at(r, siz) + return None @CachedProperty def address(self): @@ -311,14 +319,6 @@ class Symbol(LLVMObject): return lib.LLVMGetSymbolAddress(self) @CachedProperty - def file_offset(self): - """The offset of this symbol in the file, in long bytes.""" - if self.expired: - raise Exception('Symbol instance has expired.') - - return lib.LLVMGetSymbolFileOffset(self) - - @CachedProperty def size(self): """The size of the symbol, in long bytes.""" if self.expired: @@ -345,7 +345,6 @@ class Symbol(LLVMObject): """Cache all cacheable properties.""" getattr(self, 'name') getattr(self, 'address') - getattr(self, 'file_offset') getattr(self, 'size') def expire(self): @@ -471,7 +470,8 @@ def register_library(library): library.LLVMGetSectionSize.restype = c_uint64 library.LLVMGetSectionContents.argtypes = [c_object_p] - library.LLVMGetSectionContents.restype = c_char_p + # Can't use c_char_p here as it isn't a NUL-terminated string. + library.LLVMGetSectionContents.restype = POINTER(c_char) library.LLVMGetSectionAddress.argtypes = [c_object_p] library.LLVMGetSectionAddress.restype = c_uint64 @@ -495,9 +495,6 @@ def register_library(library): library.LLVMGetSymbolAddress.argtypes = [Symbol] library.LLVMGetSymbolAddress.restype = c_uint64 - library.LLVMGetSymbolFileOffset.argtypes = [Symbol] - library.LLVMGetSymbolFileOffset.restype = c_uint64 - library.LLVMGetSymbolSize.argtypes = [Symbol] library.LLVMGetSymbolSize.restype = c_uint64 |