[llvm] r194964 - python: Properly initialize before trying to create disasm
Anders Waldenborg
anders at 0x63.nu
Sun Nov 17 07:17:09 PST 2013
Author: andersg
Date: Sun Nov 17 09:17:08 2013
New Revision: 194964
URL: http://llvm.org/viewvc/llvm-project?rev=194964&view=rev
Log:
python: Properly initialize before trying to create disasm
As the "LLVMInitializeAll*" functions are not available as symbols in
the shared library they can't be used, and as a workaround a list of
the targets is kept and the individual symbols tried. As soon as the
"All"-functions are changed to proper symbols (as opposed to static
inlines in the headers) this hack will be replace with simple calls
to the corresponding "LLVMInitializeAll*" functions.
Reviewed By: indygreg
CC: llvm-commits
Differential Revision: http://llvm-reviews.chandlerc.com/D1879
Modified:
llvm/trunk/bindings/python/llvm/disassembler.py
Modified: llvm/trunk/bindings/python/llvm/disassembler.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/python/llvm/disassembler.py?rev=194964&r1=194963&r2=194964&view=diff
==============================================================================
--- llvm/trunk/bindings/python/llvm/disassembler.py (original)
+++ llvm/trunk/bindings/python/llvm/disassembler.py Sun Nov 17 09:17:08 2013
@@ -33,6 +33,29 @@ callbacks = {}
# Constants for set_options
Option_UseMarkup = 1
+
+
+_initialized = False
+_targets = ['AArch64', 'ARM', 'Hexagon', 'MSP430', 'Mips', 'NVPTX', 'PowerPC', 'R600', 'Sparc', 'SystemZ', 'X86', 'XCore']
+def _ensure_initialized():
+ global _initialized
+ if not _initialized:
+ # Here one would want to call the functions
+ # LLVMInitializeAll{TargetInfo,TargetMC,Disassembler}s, but
+ # unfortunately they are only defined as static inline
+ # functions in the header files of llvm-c, so they don't exist
+ # as symbols in the shared library.
+ # So until that is fixed use this hack to initialize them all
+ for tgt in _targets:
+ for initializer in ("TargetInfo", "TargetMC", "Disassembler"):
+ try:
+ f = getattr(lib, "LLVMInitialize" + tgt + initializer)
+ except AttributeError:
+ continue
+ f()
+ _initialized = True
+
+
class Disassembler(LLVMObject):
"""Represents a disassembler instance.
@@ -47,6 +70,9 @@ class Disassembler(LLVMObject):
The triple argument is the triple to create the disassembler for. This
is something like 'i386-apple-darwin9'.
"""
+
+ _ensure_initialized()
+
ptr = lib.LLVMCreateDisasm(c_char_p(triple), c_void_p(None), c_int(0),
callbacks['op_info'](0), callbacks['symbol_lookup'](0))
if not ptr.contents:
More information about the llvm-commits
mailing list