jyapayne/llvmpy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Migrate to LLVM 2.6 (KS Sreeram) (Issue #25)

Browse source 
git-svn-id: http://llvm-py.googlecode.com/svn/trunk@83 8d1e9007-1d4e-0410-b67e-1979fd6579aa
This commit is contained in:
mdevan.foobar 2009-10-28 06:02:04 +00:00
commit 5901f8d32b
9 changed files with 897 additions and 803 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -1,6 +1,7 @@
0.6, in progress:
* Migrate to LLVM 2.6 (KS Sreeram) (Issue #25).
* Inline function (Corrado Zoccolo).
* Get pointer to function (Corrado Zoccolo).
* More properties/methods for TargetData (Florian Noding) (Issue #16).

8
README
View file

@ -12,14 +12,14 @@ Home page:
Versions:
---------
This package will work only with LLVM 2.5 (currently in pre-release
testing). If you need llvm-py for LLVM 2.4, use the 0.5 version of llvm-py.
This package will work only with LLVM 2.6. If you need llvm-py for LLVM
2.5, use SVN r82 or older.
Quickstart:
-----------
1. Get 2.5 version of LLVM, build it. Make sure '--enable-pic' is passed to
LLVM's 'configure'. (Currently, you've to get it from LLVM SVN).
1. Get 2.6 version of LLVM, build it. Make sure '--enable-pic' is passed to
LLVM's 'configure'.
2. Get llvm-py from SVN, install it:

20
llvm/_core.c
View file

@ -36,6 +36,7 @@
#include "llvm-c/Analysis.h"
#include "llvm-c/Transforms/Scalar.h"
#include "llvm-c/ExecutionEngine.h"
#include "llvm-c/Target.h"
/* libc includes */
#include <stdarg.h> /* for malloc(), free() */
@ -422,8 +423,11 @@ _wrap_obj2obj(LLVMConstNeg, LLVMValueRef, LLVMValueRef)
_wrap_obj2obj(LLVMConstNot, LLVMValueRef, LLVMValueRef)
_wrap_objobj2obj(LLVMConstAdd, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objobj2obj(LLVMConstFAdd, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objobj2obj(LLVMConstSub, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objobj2obj(LLVMConstFSub, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objobj2obj(LLVMConstMul, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objobj2obj(LLVMConstFMul, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objobj2obj(LLVMConstUDiv, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objobj2obj(LLVMConstSDiv, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objobj2obj(LLVMConstFDiv, LLVMValueRef, LLVMValueRef, LLVMValueRef)
@ -436,8 +440,6 @@ _wrap_objobj2obj(LLVMConstXor, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_enumobjobj2obj(LLVMConstICmp, LLVMIntPredicate, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_enumobjobj2obj(LLVMConstFCmp, LLVMRealPredicate, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_enumobjobj2obj(LLVMConstVICmp, LLVMIntPredicate, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_enumobjobj2obj(LLVMConstVFCmp, LLVMRealPredicate, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objobj2obj(LLVMConstShl, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objobj2obj(LLVMConstLShr, LLVMValueRef, LLVMValueRef, LLVMValueRef)
@ -556,7 +558,6 @@ _wrap_obj2obj(LLVMInstIsLogicalShift, LLVMValueRef, int)
_wrap_obj2obj(LLVMInstIsArithmeticShift, LLVMValueRef, int)
_wrap_obj2obj(LLVMInstIsAssociative, LLVMValueRef, int)
_wrap_obj2obj(LLVMInstIsCommutative, LLVMValueRef, int)
_wrap_obj2obj(LLVMInstIsTrapping, LLVMValueRef, int)
_wrap_obj2obj(LLVMInstIsVolatile, LLVMValueRef, int)
_wrap_obj2obj(LLVMInstGetOpcode, LLVMValueRef, int)
_wrap_obj2str(LLVMInstGetOpcodeName, LLVMValueRef)
@ -646,8 +647,11 @@ _wrap_objobjobj2none(LLVMAddCase, LLVMValueRef, LLVMValueRef, LLVMBasicBlockRef)
/* Arithmetic */
_wrap_objobjobjstr2obj(LLVMBuildAdd, LLVMBuilderRef, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objobjobjstr2obj(LLVMBuildFAdd, LLVMBuilderRef, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objobjobjstr2obj(LLVMBuildSub, LLVMBuilderRef, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objobjobjstr2obj(LLVMBuildFSub, LLVMBuilderRef, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objobjobjstr2obj(LLVMBuildMul, LLVMBuilderRef, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objobjobjstr2obj(LLVMBuildFMul, LLVMBuilderRef, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objobjobjstr2obj(LLVMBuildUDiv, LLVMBuilderRef, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objobjobjstr2obj(LLVMBuildSDiv, LLVMBuilderRef, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objobjobjstr2obj(LLVMBuildFDiv, LLVMBuilderRef, LLVMValueRef, LLVMValueRef, LLVMValueRef)
@ -693,8 +697,6 @@ _wrap_objobjobjstr2obj(LLVMBuildBitCast, LLVMBuilderRef, LLVMValueRef, LLVMTypeR
_wrap_objenumobjobjstr2obj(LLVMBuildICmp, LLVMBuilderRef, LLVMIntPredicate, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objenumobjobjstr2obj(LLVMBuildFCmp, LLVMBuilderRef, LLVMRealPredicate, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objenumobjobjstr2obj(LLVMBuildVICmp, LLVMBuilderRef, LLVMIntPredicate, LLVMValueRef, LLVMValueRef, LLVMValueRef)
_wrap_objenumobjobjstr2obj(LLVMBuildVFCmp, LLVMBuilderRef, LLVMRealPredicate, LLVMValueRef, LLVMValueRef, LLVMValueRef)
/* Miscellaneous instructions */
@ -1267,8 +1269,6 @@ static PyMethodDef core_methods[] = {
_method( LLVMConstXor )
_method( LLVMConstICmp )
_method( LLVMConstFCmp )
_method( LLVMConstVICmp )
_method( LLVMConstVFCmp )
_method( LLVMConstShl )
_method( LLVMConstLShr )
_method( LLVMConstAShr )
@ -1366,7 +1366,6 @@ static PyMethodDef core_methods[] = {
_method( LLVMInstIsArithmeticShift )
_method( LLVMInstIsAssociative )
_method( LLVMInstIsCommutative )
_method( LLVMInstIsTrapping )
_method( LLVMInstIsVolatile )
_method( LLVMInstGetOpcode )
_method( LLVMInstGetOpcodeName )
@ -1456,8 +1455,6 @@ static PyMethodDef core_methods[] = {
/* Comparisons */
_method( LLVMBuildICmp )
_method( LLVMBuildFCmp )
_method( LLVMBuildVICmp )
_method( LLVMBuildVFCmp )
/* Miscellaneous instructions */
_method( LLVMBuildGetResult )
@ -1602,5 +1599,8 @@ static PyMethodDef core_methods[] = {
PyMODINIT_FUNC
init_core(void)
{
LLVMLinkInJIT();
LLVMLinkInInterpreter();
LLVMInitializeNativeTarget();
Py_InitModule("_core", core_methods);
}

1366
llvm/_intrinsic_ids.py
View file

File diff suppressed because it is too large Load diff

190
llvm/core.py
View file

@ -43,7 +43,7 @@ import llvm._util as _util # utility functions
# Enumerations
#===----------------------------------------------------------------------===
# type kinds
# type kinds (LLVMTypeKind enum)
TYPE_VOID = 0
TYPE_FLOAT = 1
TYPE_DOUBLE = 2
@ -58,6 +58,7 @@ TYPE_ARRAY = 10
TYPE_POINTER = 11
TYPE_OPAQUE = 12
TYPE_VECTOR = 13
TYPE_METADATA = 14
# value IDs (llvm::Value::ValueTy enum)
VALUE_ARGUMENT = 0
@ -74,11 +75,14 @@ VALUE_CONSTANT_ARRAY = 10
VALUE_CONSTANT_STRUCT = 11
VALUE_CONSTANT_VECTOR = 12
VALUE_CONSTANT_POINTER_NULL = 13
VALUE_INLINE_ASM = 14
VALUE_PSEUDO_SOURCE_VALUE = 15
VALUE_INSTRUCTION = 16
VALUE_MD_NODE = 14
VALUE_MD_STRING = 15
VALUE_NAMED_MD_NODE = 16
VALUE_INLINE_ASM = 17
VALUE_PSEUDO_SOURCE_VALUE = 18
VALUE_INSTRUCTION = 19
# instruction opcodes
# instruction opcodes (from include/llvm/Instruction.def)
OPCODE_RET = 1
OPCODE_BR = 2
OPCODE_SWITCH = 3
@ -86,53 +90,54 @@ OPCODE_INVOKE = 4
OPCODE_UNWIND = 5
OPCODE_UNREACHABLE = 6
OPCODE_ADD = 7
OPCODE_SUB = 8
OPCODE_MUL = 9
OPCODE_UDIV = 10
OPCODE_SDIV = 11
OPCODE_FDIV = 12
OPCODE_UREM = 13
OPCODE_SREM = 14
OPCODE_FREM = 15
OPCODE_SHL = 16
OPCODE_LSHR = 17
OPCODE_ASHR = 18
OPCODE_AND = 19
OPCODE_OR = 20
OPCODE_XOR = 21
OPCODE_MALLOC = 22
OPCODE_FREE = 23
OPCODE_ALLOCA = 24
OPCODE_LOAD = 25
OPCODE_STORE = 26
OPCODE_GETELEMENTPTR = 27
OPCODE_TRUNC = 28
OPCODE_ZEXT = 29
OPCODE_SZEXT = 30
OPCODE_FPTOUI = 31
OPCODE_FPTOSI = 32
OPCODE_UITOFP = 33
OPCODE_SITOFP = 34
OPCODE_FPTRUNC = 35
OPCODE_FPEXT = 36
OPCODE_PTRTOINT = 37
OPCODE_INTTOPTR = 38
OPCODE_BITCAST = 39
OPCODE_ICMP = 40
OPCODE_FCMP = 41
OPCODE_PHI = 42
OPCODE_CALL = 43
OPCODE_SELECT = 44
OPCODE_USEROP1 = 45
OPCODE_USEROP2 = 46
OPCODE_VAARG = 47
OPCODE_EXTRACTELEMENT = 48
OPCODE_INSERTELEMENT = 49
OPCODE_SHUFFLEVECTOR = 50
OPCODE_EXTRACTVALUE = 51
OPCODE_INSERTVALUE = 52
OPCODE_VICMP = 53
OPCODE_VFCMP = 54
OPCODE_FADD = 8
OPCODE_SUB = 9
OPCODE_FSUB = 10
OPCODE_MUL = 11
OPCODE_FMUL = 12
OPCODE_UDIV = 13
OPCODE_SDIV = 14
OPCODE_FDIV = 15
OPCODE_UREM = 16
OPCODE_SREM = 17
OPCODE_FREM = 18
OPCODE_SHL = 19
OPCODE_LSHR = 20
OPCODE_ASHR = 21
OPCODE_AND = 22
OPCODE_OR = 23
OPCODE_XOR = 24
OPCODE_MALLOC = 25
OPCODE_FREE = 26
OPCODE_ALLOCA = 27
OPCODE_LOAD = 28
OPCODE_STORE = 29
OPCODE_GETELEMENTPTR = 30
OPCODE_TRUNC = 31
OPCODE_ZEXT = 32
OPCODE_SEXT = 33
OPCODE_FPTOUI = 34
OPCODE_FPTOSI = 35
OPCODE_UITOFP = 36
OPCODE_SITOFP = 37
OPCODE_FPTRUNC = 38
OPCODE_FPEXT = 39
OPCODE_PTRTOINT = 40
OPCODE_INTTOPTR = 41
OPCODE_BITCAST = 42
OPCODE_ICMP = 43
OPCODE_FCMP = 44
OPCODE_PHI = 45
OPCODE_CALL = 46
OPCODE_SELECT = 47
OPCODE_USEROP1 = 48
OPCODE_USEROP2 = 49
OPCODE_VAARG = 50
OPCODE_EXTRACTELEMENT = 51
OPCODE_INSERTELEMENT = 52
OPCODE_SHUFFLEVECTOR = 53
OPCODE_EXTRACTVALUE = 54
OPCODE_INSERTVALUE = 55
# calling conventions
CC_C = 0
@ -202,16 +207,21 @@ RPRED_UNE = FCMP_UNE
RPRED_TRUE = FCMP_TRUE
# linkages
LINKAGE_EXTERNAL = 0
LINKAGE_LINKONCE = 1
LINKAGE_WEAK = 2
LINKAGE_APPENDING = 3
LINKAGE_INTERNAL = 4
LINKAGE_DLLIMPORT = 5
LINKAGE_DLLEXPORT = 6
LINKAGE_EXTERNAL_WEAK = 7
LINKAGE_GHOST = 8
LINKAGE_COMMON = 9
LINKAGE_EXTERNAL = 0
LINKAGE_AVAILABLE_EXTERNALLY = 1
LINKAGE_LINKONCE_ANY = 2
LINKAGE_LINKONCE_ODR = 3
LINKAGE_WEAK_ANY = 4
LINKAGE_WEAK_ODR = 5
LINKAGE_APPENDING = 6
LINKAGE_INTERNAL = 7
LINKAGE_PRIVATE = 8
LINKAGE_DLLIMPORT = 9
LINKAGE_DLLEXPORT = 10
LINKAGE_EXTERNAL_WEAK = 11
LINKAGE_GHOST = 12
LINKAGE_COMMON = 13
LINKAGE_LINKER_PRIVATE = 14
# visibility
VISIBILITY_DEFAULT = 0
@ -235,8 +245,11 @@ ATTR_ALWAYS_INLINE = 1<<12
ATTR_OPTIMIZE_FOR_SIZE = 1<<13
ATTR_STACK_PROTECT = 1<<14
ATTR_STACK_PROTECT_REQ = 1<<15
ATTR_ALIGNMENT = 31<<16
ATTR_NO_CAPTURE = 1<<21
ATTR_NO_REDZONE = 1<<22
ATTR_NO_IMPLICIT_FLOAT = 1<<23
ATTR_NAKED = 1<<24
ATTR_INLINE_HINT = 1<<25
# intrinsic IDs
from llvm._intrinsic_ids import *
@ -947,14 +960,26 @@ class Constant(User):
check_is_constant(rhs)
return _make_value(_core.LLVMConstAdd(self.ptr, rhs.ptr))
def fadd(self, rhs):
check_is_constant(rhs)
return _make_value(_core.LLVMConstFAdd(self.ptr, rhs.ptr))
def sub(self, rhs):
check_is_constant(rhs)
return _make_value(_core.LLVMConstSub(self.ptr, rhs.ptr))
def fsub(self, rhs):
check_is_constant(rhs)
return _make_value(_core.LLVMConstFSub(self.ptr, rhs.ptr))
def mul(self, rhs):
check_is_constant(rhs)
return _make_value(_core.LLVMConstMul(self.ptr, rhs.ptr))
def fmul(self, rhs):
check_is_constant(rhs)
return _make_value(_core.LLVMConstFMul(self.ptr, rhs.ptr))
def udiv(self, rhs):
check_is_constant(rhs)
return _make_value(_core.LLVMConstUDiv(self.ptr, rhs.ptr))
@ -999,14 +1024,6 @@ class Constant(User):
check_is_constant(rhs)
return _make_value(_core.LLVMConstFCmp(real_pred, self.ptr, rhs.ptr))
def vicmp(self, int_pred, rhs):
check_is_constant(rhs)
return _make_value(_core.LLVMConstVICmp(int_pred, self.ptr, rhs.ptr))
def vfcmp(self, real_pred, rhs):
check_is_constant(rhs)
return _make_value(_core.LLVMConstVFCmp(real_pred, self.ptr, rhs.ptr))
def shl(self, rhs):
check_is_constant(rhs)
return _make_value(_core.LLVMConstShl(self.ptr, rhs.ptr))
@ -1371,10 +1388,6 @@ class Instruction(User):
def is_commutative(self):
return _core.LLVMInstIsCommutative(self.ptr) != 0
@property
def is_trapping(self):
return _core.LLVMInstIsTrapping(self.ptr) != 0
@property
def is_volatile(self):
"""True if this is a volatile load or store."""
@ -1619,16 +1632,31 @@ class Builder(object):
check_is_value(rhs)
return _make_value(_core.LLVMBuildAdd(self.ptr, lhs.ptr, rhs.ptr, name))
def fadd(self, lhs, rhs, name=""):
check_is_value(lhs)
check_is_value(rhs)
return _make_value(_core.LLVMBuildFAdd(self.ptr, lhs.ptr, rhs.ptr, name))
def sub(self, lhs, rhs, name=""):
check_is_value(lhs)
check_is_value(rhs)
return _make_value(_core.LLVMBuildSub(self.ptr, lhs.ptr, rhs.ptr, name))
def fsub(self, lhs, rhs, name=""):
check_is_value(lhs)
check_is_value(rhs)
return _make_value(_core.LLVMBuildFSub(self.ptr, lhs.ptr, rhs.ptr, name))
def mul(self, lhs, rhs, name=""):
check_is_value(lhs)
check_is_value(rhs)
return _make_value(_core.LLVMBuildMul(self.ptr, lhs.ptr, rhs.ptr, name))
def fmul(self, lhs, rhs, name=""):
check_is_value(lhs)
check_is_value(rhs)
return _make_value(_core.LLVMBuildFMul(self.ptr, lhs.ptr, rhs.ptr, name))
def udiv(self, lhs, rhs, name=""):
check_is_value(lhs)
check_is_value(rhs)
@ -1838,18 +1866,6 @@ class Builder(object):
return _make_value(
_core.LLVMBuildFCmp(self.ptr, rpred, lhs.ptr, rhs.ptr, name))
def vicmp(self, ipred, lhs, rhs, name=""):
check_is_value(lhs)
check_is_value(rhs)
return _make_value(
_core.LLVMBuildVICmp(self.ptr, ipred, lhs.ptr, rhs.ptr, name))
def vfcmp(self, rpred, lhs, rhs, name=""):
check_is_value(lhs)
check_is_value(rhs)
return _make_value(
_core.LLVMBuildVFCmp(self.ptr, rpred, lhs.ptr, rhs.ptr, name))
# misc
def getresult(self, retval, idx, name=""):

100
llvm/extra.cpp
View file

@ -64,6 +64,7 @@
#include "llvm/Transforms/Instrumentation.h"
#include "llvm/Transforms/Utils/Cloning.h"
#include "llvm/Linker.h"
#include "llvm/Support/SourceMgr.h"
// LLVM-C includes
#include "llvm-c/Core.h"
@ -78,7 +79,8 @@
template <typename W, typename UW>
char *do_print(W obj)
{
std::ostringstream buf;
std::string s;
llvm::raw_string_ostream buf(s);
UW *p = llvm::unwrap(obj);
assert(p);
p->print(buf);
@ -87,7 +89,8 @@ char *do_print(W obj)
char *LLVMDumpModuleToString(LLVMModuleRef module)
{
std::ostringstream buf;
std::string s;
llvm::raw_string_ostream buf(s);
llvm::Module *p = llvm::unwrap(module);
assert(p);
p->print(buf, NULL);
@ -104,66 +107,6 @@ char *LLVMDumpValueToString(LLVMValueRef value)
return do_print<LLVMValueRef, llvm::Value>(value);
}
LLVMValueRef LLVMConstVICmp(LLVMIntPredicate predicate, LLVMValueRef lhs,
LLVMValueRef rhs)
{
llvm::Constant *lhsp = llvm::unwrap<llvm::Constant>(lhs);
assert(lhsp);
llvm::Constant *rhsp = llvm::unwrap<llvm::Constant>(rhs);
assert(rhsp);
llvm::Constant *vicmp =
llvm::ConstantExpr::getVICmp(predicate, lhsp, rhsp);
return llvm::wrap(vicmp);
}
LLVMValueRef LLVMConstVFCmp(LLVMRealPredicate predicate, LLVMValueRef lhs,
LLVMValueRef rhs)
{
llvm::Constant *lhsp = llvm::unwrap<llvm::Constant>(lhs);
assert(lhsp);
llvm::Constant *rhsp = llvm::unwrap<llvm::Constant>(rhs);
assert(rhsp);
llvm::Constant *vfcmp =
llvm::ConstantExpr::getVFCmp(predicate, lhsp, rhsp);
return llvm::wrap(vfcmp);
}
LLVMValueRef LLVMBuildVICmp(LLVMBuilderRef builder, LLVMIntPredicate predicate,
LLVMValueRef lhs, LLVMValueRef rhs, const char *name)
{
llvm::IRBuilder<> *builderp = llvm::unwrap(builder);
assert(builderp);
llvm::Value *lhsp = llvm::unwrap(lhs);
assert(lhsp);
llvm::Value *rhsp = llvm::unwrap(rhs);
assert(rhsp);
llvm::Value *inst = builderp->CreateVICmp(
static_cast<llvm::CmpInst::Predicate>(predicate),
lhsp, rhsp, name);
return llvm::wrap(inst);
}
LLVMValueRef LLVMBuildVFCmp(LLVMBuilderRef builder, LLVMRealPredicate predicate,
LLVMValueRef lhs, LLVMValueRef rhs, const char *name)
{
llvm::IRBuilder<> *builderp = llvm::unwrap(builder);
assert(builderp);
llvm::Value *lhsp = llvm::unwrap(lhs);
assert(lhsp);
llvm::Value *rhsp = llvm::unwrap(rhs);
assert(rhsp);
llvm::Value *inst = builderp->CreateVFCmp(
static_cast<llvm::CmpInst::Predicate>(predicate),
lhsp, rhsp, name);
return llvm::wrap(inst);
}
unsigned LLVMModuleGetPointerSize(LLVMModuleRef module)
{
llvm::Module *modulep = llvm::unwrap(module);
@ -215,7 +158,6 @@ inst_checkfn(LLVMInstIsLogicalShift, isLogicalShift)
inst_checkfn(LLVMInstIsArithmeticShift, isArithmeticShift)
inst_checkfn(LLVMInstIsAssociative, isAssociative)
inst_checkfn(LLVMInstIsCommutative, isCommutative)
inst_checkfn(LLVMInstIsTrapping, isTrapping)
unsigned LLVMInstIsVolatile(LLVMValueRef v)
{
@ -405,9 +347,13 @@ LLVMModuleRef LLVMGetModuleFromAssembly(const char *asmtext, unsigned txtlen,
assert(out);
llvm::Module *modulep;
llvm::ParseError error;
if (!(modulep = llvm::ParseAssemblyString(asmtext, NULL, error))) {
*out = strdup(error.getRawMessage().c_str());
llvm::SMDiagnostic error;
if (!(modulep = llvm::ParseAssemblyString(asmtext, NULL, error,
llvm::getGlobalContext()))) {
std::string s;
llvm::raw_string_ostream buf(s);
error.Print("llvm-py", buf);
*out = strdup(buf.str().c_str());
return NULL;
}
@ -426,7 +372,8 @@ LLVMModuleRef LLVMGetModuleFromBitcode(const char *bitcode, unsigned bclen,
std::string msg;
llvm::Module *modulep;
if (!(modulep = llvm::ParseBitcodeFile(mbp, &msg)))
if (!(modulep = llvm::ParseBitcodeFile(mbp, llvm::getGlobalContext(),
&msg)))
*out = strdup(msg.c_str());
delete mbp;
@ -457,7 +404,8 @@ unsigned char *LLVMGetBitcodeFromModule(LLVMModuleRef module, unsigned *lenp)
assert(modulep);
/* get bc into a string */
std::ostringstream buf;
std::string s;
llvm::raw_string_ostream buf(s);
llvm::WriteBitcodeToFile(modulep, buf);
const std::string& bc = buf.str();
@ -530,24 +478,20 @@ void LLVMAdd ## P ## Pass (LLVMPassManagerRef passmgr) { \
pmp->add( create ## P ## Pass ()); \
}
define_pass( AggressiveDCE )
define_pass( ArgumentPromotion )
define_pass( BlockPlacement )
define_pass( BreakCriticalEdges )
define_pass( CodeGenPrepare )
define_pass( CondPropagation )
define_pass( ConstantMerge )
define_pass( DeadCodeElimination )
define_pass( DeadArgElimination )
define_pass( DeadTypeElimination )
define_pass( DeadInstElimination )
define_pass( DeadStoreElimination )
/* define_pass( GCSE ): removed in LLVM 2.4 */
define_pass( GlobalDCE )
define_pass( GlobalOptimizer )
define_pass( GVNPRE )
define_pass( IndMemRem )
define_pass( IndVarSimplify )
define_pass( FunctionInlining )
define_pass( BlockProfiler )
define_pass( EdgeProfiler )
@ -559,34 +503,22 @@ llvm::ModulePass *createInternalizePass() { return llvm::createInternalizePass(t
define_pass( Internalize )
define_pass( IPConstantPropagation )
define_pass( IPSCCP )
define_pass( JumpThreading )
define_pass( LCSSA )
define_pass( LICM )
define_pass( LoopDeletion )
define_pass( LoopExtractor )
define_pass( SingleLoopExtractor )
define_pass( LoopIndexSplit )
define_pass( LoopStrengthReduce )
define_pass( LoopRotate )
define_pass( LoopUnroll )
define_pass( LoopUnswitch )
define_pass( LoopSimplify )
define_pass( LowerAllocations )
define_pass( LowerInvoke )
define_pass( LowerSetJmp )
define_pass( LowerSwitch )
define_pass( MemCpyOpt )
define_pass( UnifyFunctionExitNodes )
define_pass( PredicateSimplifier )
define_pass( PruneEH )
define_pass( RaiseAllocations )
define_pass( DemoteRegisterToMemory )
define_pass( ScalarReplAggregates )
define_pass( SCCP )
define_pass( SimplifyLibCalls )
define_pass( StripSymbols )
define_pass( StripDeadPrototypes )
define_pass( StructRetPromotion )
define_pass( TailCallElimination )
define_pass( TailDuplication )

9
test/test.py
View file

@ -34,14 +34,17 @@ class TestModule(unittest.TestCase):
self.assertNotEqual(m.owner, None)
self.assertEqual(repr(m.owner), mp_repr)
m = None
self.assertEqual(gc.garbage, [])
# This doesn't work. Looks like there are leaks elsewhere
# too (unittest module?).
#gc.collect()
#self.assertEqual(gc.garbage, [])
# delete a module which was owned by a module provider that has
# gone out of scope
m2 = Module.new("test1.2")
temp_mp(m2)
del m2
self.assertEqual(gc.garbage, [])
#self.assertEqual(gc.garbage, [])
# delete a module provider object which owned a module that has
# gone out of scope
@ -97,7 +100,7 @@ class TestModule(unittest.TestCase):
self.assertEqual(r, 0)
r = m.add_type_name("typename41", Type.int())
self.assertEqual(r, 1)
reqd = "; ModuleID = 'test4.1'\n\t%typename41 = type i32\n"
reqd = "; ModuleID = 'test4.1'\n\n%typename41 = type i32\n"
self.assertEqual(str(m), reqd)
r = m.delete_type_name("typename41")
reqd = "; ModuleID = 'test4.1'\n"

5
test/testall.py
View file

@ -208,8 +208,6 @@ def do_constant():
f.fdiv(f).frem(f).fcmp(RPRED_ULT, f)
vi = Constant.vector([Constant.int(ti,42)]*10)
vf = Constant.vector([Constant.real(Type.float(), 3.14)]*10)
vi.vicmp(IPRED_ULT, vi)
vf.vfcmp(RPRED_ULT, vf)
k.shl(k).lshr(k).ashr(k)
# TODO gep
k.trunc(Type.int(1))
@ -457,8 +455,6 @@ def do_builder():
b.fcmp(RPRED_ULT, fv, fv)
vi = Constant.vector([Constant.int(ti,42)]*10)
vf = Constant.vector([Constant.real(Type.float(), 3.14)]*10)
b.vicmp(IPRED_ULT, vi, vi)
b.vfcmp(RPRED_ULT, vf, vf)
# TODO b.getresult(v, 0)
b.call(f, [v])
b.select(Constant.int(Type.int(1), 1), blk, blk)
@ -478,7 +474,6 @@ def do_builder():
t = i.is_arithmetic_shift == False
t = i.is_associative == False
t = i.is_commutative == False
t = i.is_trapping == False
t = i.is_volatile == False
t = i.opcode
t = i.opcode_name

1
tools/genopcodes.sh Executable file
View file

@ -0,0 +1 @@
cat ~/local/include/llvm/Instruction.def | grep '^HANDLE' | sed -e 's/^[^(]*(//' | sed -e 's#).*$##' | sed -e 's/,[^,]*$//' | sed -e 's/,//' | awk '{printf("OPCODE_%-14s = %s\n", $2, $1);}'