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

Drop unused argument for GenericValue.pointer().

Browse source
This commit is contained in:
Siu Kwan Lam 2012-07-26 15:44:53 -07:00
commit 4783429804
2 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
llvm/_core.cpp
View file

@ -1180,18 +1180,18 @@ _wLLVMCreateGenericValueOfFloat(PyObject *self, PyObject *args)
static PyObject * static PyObject *
_wLLVMCreateGenericValueOfPointer(PyObject *self, PyObject *args) _wLLVMCreateGenericValueOfPointer(PyObject *self, PyObject *args)
{ {
PyObject *obj1; // PyObject *obj1;
LLVMTypeRef ty; // LLVMTypeRef ty; //unused?
unsigned long long n_; unsigned long long n_;
size_t n; size_t n;
LLVMGenericValueRef gv; LLVMGenericValueRef gv;
if (!PyArg_ParseTuple(args, "OL", &obj1, &n_)) if (!PyArg_ParseTuple(args, "L", &n_))
return NULL; return NULL;
n=n_; n=n_;
ty = (LLVMTypeRef) PyCapsule_GetPointer(obj1, NULL); // ty = (LLVMTypeRef) PyCapsule_GetPointer(obj1, NULL);
gv = LLVMCreateGenericValueOfPointer((void*)n); gv = LLVMCreateGenericValueOfPointer((void*)n);
return ctor_LLVMGenericValueRef(gv); return ctor_LLVMGenericValueRef(gv);

24
llvm/ee.py
View file

@ -36,7 +36,9 @@ import llvm # top-level, for common stuff
import llvm.core as core # module, function etc. import llvm.core as core # module, function etc.
import llvm._core as _core # C wrappers import llvm._core as _core # C wrappers
import llvm._util as _util # utility functions import llvm._util as _util # utility functions
import logging
logger = logging.getLogger(__name__)
#===----------------------------------------------------------------------=== #===----------------------------------------------------------------------===
# Enumerations # Enumerations
@ -141,9 +143,25 @@ class GenericValue(object):
return GenericValue(ptr) return GenericValue(ptr)
@staticmethod @staticmethod
def pointer(ty, intval): def pointer(*args):
core.check_is_type(ty) '''
ptr = _core.LLVMCreateGenericValueOfPointer(ty.ptr, intval) One argument version takes (addr).
Two argument version takes (ty, addr). [Deprecated]
`ty` is unused.
`addr` is an integer representing an address.
TODO: remove two argument version.
'''
if len(args)==2:
logger.warning("Deprecated: Two argument version of "
"GenericValue.pointer() is deprecated.")
addr = args[1]
elif len(args)!=1:
raise TypeError("pointer() takes 1 or 2 arguments.")
else:
addr = args[0]
ptr = _core.LLVMCreateGenericValueOfPointer(addr)
return GenericValue(ptr) return GenericValue(ptr)
def __init__(self, ptr): def __init__(self, ptr):