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

Merge branch 'master' of github.com:llvmpy/llvmpy into llpython-dev

Browse source
This commit is contained in:
Jon Riehl 2013-06-14 11:35:48 -05:00
commit ecf88f93e2
1 changed files with 57 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

67
llvmpy/include/llvm_binding/extra.h
View file

@ -270,7 +270,12 @@ llvm::ExecutionEngine* ExecutionEngine_create(
ExecutionEngine *ee = ExecutionEngine::create(M, ForceInterpreter, ExecutionEngine *ee = ExecutionEngine::create(M, ForceInterpreter,
&ErrorStr, OptLevel, &ErrorStr, OptLevel,
GVsWithCode); GVsWithCode);
PyFile_WriteString(ErrorStr.c_str(), errout); auto_pyobject buf = PyBytes_FromString(ErrorStr.c_str());
if (errout && NULL == PyObject_CallMethod(errout, "write", "O", *buf)){
return NULL;
}
// PyFile_WriteString(ErrorStr.c_str(), errout);
return ee; return ee;
} }
@ -292,7 +297,11 @@ llvm::ExecutionEngine* ExecutionEngine_createJIT(
std::string ErrorStr; std::string ErrorStr;
ExecutionEngine *ee = ExecutionEngine::createJIT(M, &ErrorStr, JMM, OL, ExecutionEngine *ee = ExecutionEngine::createJIT(M, &ErrorStr, JMM, OL,
GCsWithCode, RM, CMM); GCsWithCode, RM, CMM);
PyFile_WriteString(ErrorStr.c_str(), errout); auto_pyobject buf = PyBytes_FromString(ErrorStr.c_str());
if (errout && NULL == PyObject_CallMethod(errout, "write", "O", *buf)){
return NULL;
}
// PyFile_WriteString(ErrorStr.c_str(), errout);
return ee; return ee;
} }
@ -512,9 +521,13 @@ PyObject* llvm_getBitcodeTargetTriple(llvm::StringRef Buf,
if (FObj) { if (FObj) {
std::string ErrStr; std::string ErrStr;
Triple = getBitcodeTargetTriple(MB, Ctx, &ErrStr); Triple = getBitcodeTargetTriple(MB, Ctx, &ErrStr);
if (-1 == PyFile_WriteString(ErrStr.c_str(), FObj)) { auto_pyobject buf = PyBytes_FromString(ErrStr.c_str());
if (NULL == PyObject_CallMethod(FObj, "write", "O", *buf)){
return NULL; return NULL;
} }
// if (-1 == PyFile_WriteString(ErrStr.c_str(), FObj)) {
// return NULL;
// }
} else { } else {
Triple = getBitcodeTargetTriple(MB, Ctx); Triple = getBitcodeTargetTriple(MB, Ctx);
} }
@ -585,9 +598,15 @@ PyObject* Linker_LinkInModule(llvm::Linker* Linker,
if (! failed) { if (! failed) {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} else { } else {
if (-1 == PyFile_WriteString(errmsg.c_str(), ErrMsg)) {
auto_pyobject buf = PyBytes_FromString(errmsg.c_str());
if (NULL == PyObject_CallMethod(ErrMsg, "write", "O", *buf)){
return NULL; return NULL;
} }
// if (-1 == PyFile_WriteString(errmsg.c_str(), ErrMsg)) {
// return NULL;
// }
Py_RETURN_TRUE; Py_RETURN_TRUE;
} }
} }
@ -603,9 +622,13 @@ PyObject* Linker_LinkModules(llvm::Module* Dest,
if (! failed) { if (! failed) {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} else { } else {
if (-1 == PyFile_WriteString(errmsg.c_str(), ErrMsg)) { auto_pyobject buf = PyBytes_FromString(errmsg.c_str());
if (NULL == PyObject_CallMethod(ErrMsg, "write", "O", *buf)){
return NULL; return NULL;
} }
// if (-1 == PyFile_WriteString(errmsg.c_str(), ErrMsg)) {
// return NULL;
// }
Py_RETURN_TRUE; Py_RETURN_TRUE;
} }
} }
@ -665,9 +688,14 @@ PyObject* llvm_verifyModule(const llvm::Module& Fn,
bool failed = llvm::verifyModule(Fn, Action, &errmsg); bool failed = llvm::verifyModule(Fn, Action, &errmsg);
if (failed) { if (failed) {
if (-1 == PyFile_WriteString(errmsg.c_str(), ErrMsg)) { auto_pyobject buf = PyBytes_FromString(errmsg.c_str());
if (NULL == PyObject_CallMethod(ErrMsg, "write", "O", *buf)){
return NULL; return NULL;
} }
// if (-1 == PyFile_WriteString(errmsg.c_str(), ErrMsg)) {
// return NULL;
// }
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
@ -790,9 +818,13 @@ PyObject* DynamicLibrary_LoadLibraryPermanently(const char * Filename,
std::string errmsg; std::string errmsg;
failed = DynamicLibrary::LoadLibraryPermanently(Filename, &errmsg); failed = DynamicLibrary::LoadLibraryPermanently(Filename, &errmsg);
if (failed) { if (failed) {
if (-1 == PyFile_WriteString(errmsg.c_str(), ErrMsg)) { auto_pyobject buf = PyBytes_FromString(errmsg.c_str());
if (NULL == PyObject_CallMethod(ErrMsg, "write", "O", *buf)){
return NULL; return NULL;
} }
// if (-1 == PyFile_WriteString(errmsg.c_str(), ErrMsg)) {
// return NULL;
// }
} }
} else { } else {
failed = DynamicLibrary::LoadLibraryPermanently(Filename); failed = DynamicLibrary::LoadLibraryPermanently(Filename);
@ -835,7 +867,12 @@ PyObject* TargetRegistry_lookupTarget(const std::string &Triple,
std::string error; std::string error;
const Target* target = TargetRegistry::lookupTarget(Triple, error); const Target* target = TargetRegistry::lookupTarget(Triple, error);
if (!target) { if (!target) {
PyFile_WriteString(error.c_str(), Error); // PyFile_WriteString(error.c_str(), Error);
auto_pyobject buf = PyBytes_FromString(error.c_str());
if (NULL == PyObject_CallMethod(Error, "write", "O", *buf)){
return NULL;
}
Py_RETURN_NONE; Py_RETURN_NONE;
} else { } else {
return pycapsule_new(const_cast<Target*>(target), "llvm::Target"); return pycapsule_new(const_cast<Target*>(target), "llvm::Target");
@ -852,7 +889,12 @@ PyObject* TargetRegistry_lookupTarget(const std::string &Arch,
std::string error; std::string error;
const Target* target = TargetRegistry::lookupTarget(Arch, Triple, error); const Target* target = TargetRegistry::lookupTarget(Arch, Triple, error);
if (!target) { if (!target) {
PyFile_WriteString(error.c_str(), Error); // PyFile_WriteString(error.c_str(), Error);
auto_pyobject buf = PyBytes_FromString(error.c_str());
if (NULL == PyObject_CallMethod(Error, "write", "O", *buf)){
return NULL;
}
Py_RETURN_NONE; Py_RETURN_NONE;
} else { } else {
return pycapsule_new(const_cast<Target*>(target), "llvm::Target"); return pycapsule_new(const_cast<Target*>(target), "llvm::Target");
@ -867,7 +909,12 @@ PyObject* TargetRegistry_getClosestTargetForJIT(PyObject* Error)
std::string error; std::string error;
const Target* target = TargetRegistry::getClosestTargetForJIT(error); const Target* target = TargetRegistry::getClosestTargetForJIT(error);
if (!target) { if (!target) {
PyFile_WriteString(error.c_str(), Error); auto_pyobject buf = PyBytes_FromString(error.c_str());
if (NULL == PyObject_CallMethod(Error, "write", "O", *buf)){
return NULL;
}
// PyFile_WriteString(error.c_str(), Error);
Py_RETURN_NONE; Py_RETURN_NONE;
} else { } else {
return pycapsule_new(const_cast<Target*>(target), "llvm::Target"); return pycapsule_new(const_cast<Target*>(target), "llvm::Target");