Update README.rst

README.rst

@@ -30,10 +30,13 @@ Quickstart
     to separate your custom build from the default system package.  Please
     replace ``LLVM_INSTALL_PATH`` with your own path.
 
-3. Run ``REQUIRES_RTTI=1 make`` to build.
+3. Run ``REQUIRES_RTTI=1 make install`` to build and install.
 
     **Note**: With LLVM 3.2, the default build configuration has C++ RTTI 
     disabled.  However, llvmpy requires RTTI.
+    
+    **Note**: Use ``make -j2 install`` to enable concurrent build.  
+    Replace ``2`` with the actual number of processor you have. 
 
 4. Get llvm-py and install it::
 

llvm/core.py

@@ -174,37 +174,20 @@ class OpcodeEnum(Enum):
     OPCODE_PTRTOINT       = 42
     OPCODE_INTTOPTR       = 43
     OPCODE_BITCAST        = 44
-    if llvm.version <= (3, 3):
-        OPCODE_ICMP           = 45
-        OPCODE_FCMP           = 46
-        OPCODE_PHI            = 47
-        OPCODE_CALL           = 48
-        OPCODE_SELECT         = 49
-        OPCODE_USEROP1        = 50
-        OPCODE_USEROP2        = 51
-        OPCODE_VAARG          = 52
-        OPCODE_EXTRACTELEMENT = 53
-        OPCODE_INSERTELEMENT  = 54
-        OPCODE_SHUFFLEVECTOR  = 55
-        OPCODE_EXTRACTVALUE   = 56
-        OPCODE_INSERTVALUE    = 57
-        OPCODE_LANDINGPAD     = 58
-    else:
-        OPCODE_ADDRSPACECAST  = 45
-        OPCODE_ICMP           = 46
-        OPCODE_FCMP           = 47
-        OPCODE_PHI            = 48
-        OPCODE_CALL           = 49
-        OPCODE_SELECT         = 50
-        OPCODE_USEROP1        = 51
-        OPCODE_USEROP2        = 52
-        OPCODE_VAARG          = 53
-        OPCODE_EXTRACTELEMENT = 54
-        OPCODE_INSERTELEMENT  = 55
-        OPCODE_SHUFFLEVECTOR  = 56
-        OPCODE_EXTRACTVALUE   = 57
-        OPCODE_INSERTVALUE    = 58
-        OPCODE_LANDINGPAD     = 59
+    OPCODE_ICMP           = 45
+    OPCODE_FCMP           = 46
+    OPCODE_PHI            = 47
+    OPCODE_CALL           = 48
+    OPCODE_SELECT         = 49
+    OPCODE_USEROP1        = 50
+    OPCODE_USEROP2        = 51
+    OPCODE_VAARG          = 52
+    OPCODE_EXTRACTELEMENT = 53
+    OPCODE_INSERTELEMENT  = 54
+    OPCODE_SHUFFLEVECTOR  = 55
+    OPCODE_EXTRACTVALUE   = 56
+    OPCODE_INSERTVALUE    = 57
+    OPCODE_LANDINGPAD     = 58
 
 OpcodeEnum.declare()
 

llvmpy/src/DIBuilder.py

@@ -114,38 +114,20 @@ class DIBuilder:
                               ref(DIType),          # Ty
                               )
 
-    if LLVM_VERSION <= (3, 3):
-        createClassType = Method(DIType,
-                                 ref(DIDescriptor),     # Scope
-                                 stringref_arg,         # Name
-                                 ref(DIFile),           # File
-                                 unsigned_arg,          # LineNum
-                                 uint64_arg,            # SizeInBits
-                                 uint64_arg,            # AlignInBits
-                                 uint64_arg,            # OffsetInBits,
-                                 unsigned_arg,          # Flags
-                                 ref(DIType),           # DerivedFrom
-                                 ref(DIArray),          # Elements
-                                 ptr(MDNode),           # VTableHolder = 0
-                                 ptr(MDNode),           # TemplateParms = 0
-                                 ).require_only(10)
-    else:
-        createClassType = Method(DIType,
-                                 ref(DIDescriptor),     # Scope
-                                 stringref_arg,         # Name
-                                 ref(DIFile),           # File
-                                 unsigned_arg,          # LineNum
-                                 uint64_arg,            # SizeInBits
-                                 uint64_arg,            # AlignInBits
-                                 uint64_arg,            # OffsetInBits,
-                                 unsigned_arg,          # Flags
-                                 ref(DIType),           # DerivedFrom
-                                 ref(DIArray),          # Elements
-                                 ref(DIType),           # VTableHolder = DIType()
-                                 ptr(MDNode),           # TemplateParms = 0
-                                 stringref_arg,         # UniqueIdentifier
-                                 ).require_only(10)
-
+    createClassType = Method(DIType,
+                             ref(DIDescriptor),     # Scope
+                             stringref_arg,         # Name
+                             ref(DIFile),           # File
+                             unsigned_arg,          # LineNum
+                             uint64_arg,            # SizeInBits
+                             uint64_arg,            # AlignInBits
+                             uint64_arg,            # OffsetInBits,
+                             unsigned_arg,          # Flags
+                             ref(DIType),           # DerivedFrom
+                             ref(DIArray),          # Elements
+                             ptr(MDNode),           # VTableHolder = 0
+                             ptr(MDNode),           # TemplateParms = 0
+                             ).require_only(10)
 
     if LLVM_VERSION >= (3, 3):
         createStructType = Method(DIType,
@@ -321,7 +303,7 @@ class DIBuilder:
                           bool_arg,                 # isDefinition
                           unsigned_arg,             # Virtuality=0
                           unsigned_arg,             # VTableIndex=0
-                          ptr(MDNode) if LLVM_VERSION <= (3, 3) else ref(DIType), # VTableHolder
+                          ptr(MDNode),              # *VTableHolder=0
                           unsigned_arg,             # Flags=0
                           bool_arg,                 # isOptimized=false
                           ptr(Function),            # *Fn=0

llvmpy/src/ExecutionEngine/ExecutionEngine.py

@@ -88,6 +88,9 @@ class ExecutionEngine:
     isLazyCompilationDisabled = Method(cast(Bool, bool))
     DisableGVCompilation = Method(Void, cast(bool, Bool))
     isSymbolSearchingDisabled = Method(cast(Bool, bool))
+    RegisterTable = Method(Void, ptr(Function), cast(int, VoidPtr))
+    DeregisterTable = Method(Void, ptr(Function))
+    DeregisterAllTables = Method()
 
     _runFunction = CustomMethod('ExecutionEngine_RunFunction',
                                 PyObjectPtr, ptr(Function), PyObjectPtr)

llvmpy/src/GlobalValue.py

@@ -13,7 +13,7 @@ class GlobalValue:
 
     LinkageTypes = Enum('''
         ExternalLinkage, AvailableExternallyLinkage, LinkOnceAnyLinkage,
-        LinkOnceODRLinkage, WeakAnyLinkage,
+        LinkOnceODRLinkage, LinkOnceODRAutoHideLinkage, WeakAnyLinkage,
         WeakODRLinkage, AppendingLinkage, InternalLinkage, PrivateLinkage,
         LinkerPrivateLinkage, LinkerPrivateWeakLinkage, DLLImportLinkage,
         DLLExportLinkage, ExternalWeakLinkage, CommonLinkage

llvmpy/src/Support/TargetRegistry.py

@@ -34,6 +34,13 @@ class Target:
     hasJIT = _has()
     hasTargetMachine = _has()
     hasMCAsmBackend = _has()
+    hasMCAsmParser = _has()
+    hasAsmPrinter = _has()
+    hasMCDisassembler = _has()
+    hasMCInstPrinter = _has()
+    hasMCCodeEmitter = _has()
+    hasMCObjectStreamer = _has()
+    hasAsmStreamer = _has()
 
     createTargetMachine = Method(ptr(TargetMachine),
                                  cast(str, StringRef), # triple

test/target_info.py

@@ -10,7 +10,14 @@ mthds = (
     ("description:",            "getShortDescription"),
     ("has JIT:",                "hasJIT"             ),
     ("has target machine:",     "hasTargetMachine"   ),
-    ("has asm backend:",        "hasMCAsmBackend"    )
+    ("has asm backend:",        "hasMCAsmBackend"    ),
+    ("has asm parser:",         "hasMCAsmParser"     ),
+    ("has asm printer:",        "hasAsmPrinter"      ),
+    ("has disassembler:",       "hasMCDisassembler"  ),
+    ("has inst printer:",       "hasMCInstPrinter"   ),
+    ("has code emitter:",       "hasMCCodeEmitter"   ),
+    ("has object streamer:",    "hasMCObjectStreamer"),
+    ("has asm streamer:",       "hasAsmStreamer"     )
 )
 
 for target in llvm.TargetRegistry.targetsList():