Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Gwenaël Samain
cython
Commits
93ab8309
Commit
93ab8309
authored
Aug 30, 2014
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
allow fast PyLong unpacking also for small integer types
parent
be95915c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
18 deletions
+14
-18
Cython/Utility/TypeConversion.c
Cython/Utility/TypeConversion.c
+14
-18
No files found.
Cython/Utility/TypeConversion.c
View file @
93ab8309
...
...
@@ -483,9 +483,9 @@ static CYTHON_INLINE PyObject* {{TO_PY_FUNCTION}}({{TYPE}} value) {
/////////////// CIntFromPyVerify ///////////////
#define __PYX_VERIFY_RETURN_INT(target_type, func_type, func
)
\
#define __PYX_VERIFY_RETURN_INT(target_type, func_type, func
_value)
\
{ \
func_type value = func
(x);
\
func_type value = func
_value;
\
if (sizeof(target_type) < sizeof(func_type)) { \
if (unlikely(value != (func_type) (target_type) value)) { \
func_type zero = 0; \
...
...
@@ -523,7 +523,7 @@ static CYTHON_INLINE {{TYPE}} {{FROM_PY_FUNCTION}}(PyObject *x) {
#if PY_MAJOR_VERSION < 3
if
(
likely
(
PyInt_Check
(
x
)))
{
if
(
sizeof
({{
TYPE
}})
<
sizeof
(
long
))
{
__PYX_VERIFY_RETURN_INT
({{
TYPE
}},
long
,
PyInt_AS_LONG
)
__PYX_VERIFY_RETURN_INT
({{
TYPE
}},
long
,
PyInt_AS_LONG
(
x
)
)
}
else
{
long
val
=
PyInt_AS_LONG
(
x
);
if
(
is_unsigned
&&
unlikely
(
val
<
0
))
{
...
...
@@ -539,11 +539,9 @@ static CYTHON_INLINE {{TYPE}} {{FROM_PY_FUNCTION}}(PyObject *x) {
if
(
is_unsigned
)
{
#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
#if CYTHON_USE_PYLONG_INTERNALS
if
(
sizeof
(
digit
)
<=
sizeof
({{
TYPE
}}))
{
switch
(
Py_SIZE
(
x
))
{
case
0
:
return
0
;
case
1
:
return
({{
TYPE
}})
((
PyLongObject
*
)
x
)
->
ob_digit
[
0
];
}
switch
(
Py_SIZE
(
x
))
{
case
0
:
return
0
;
case
1
:
__PYX_VERIFY_RETURN_INT
({{
TYPE
}},
digit
,
((
PyLongObject
*
)
x
)
->
ob_digit
[
0
]);
}
#endif
#endif
...
...
@@ -553,26 +551,24 @@ static CYTHON_INLINE {{TYPE}} {{FROM_PY_FUNCTION}}(PyObject *x) {
return
({{
TYPE
}})
-
1
;
}
if
(
sizeof
({{
TYPE
}})
<=
sizeof
(
unsigned
long
))
{
__PYX_VERIFY_RETURN_INT
({{
TYPE
}},
unsigned
long
,
PyLong_AsUnsignedLong
)
__PYX_VERIFY_RETURN_INT
({{
TYPE
}},
unsigned
long
,
PyLong_AsUnsignedLong
(
x
)
)
}
else
if
(
sizeof
({{
TYPE
}})
<=
sizeof
(
unsigned
long
long
))
{
__PYX_VERIFY_RETURN_INT
({{
TYPE
}},
unsigned
long
long
,
PyLong_AsUnsignedLongLong
)
__PYX_VERIFY_RETURN_INT
({{
TYPE
}},
unsigned
long
long
,
PyLong_AsUnsignedLongLong
(
x
)
)
}
}
else
{
#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
#if CYTHON_USE_PYLONG_INTERNALS
if
(
sizeof
(
digit
)
<=
sizeof
({{
TYPE
}}))
{
switch
(
Py_SIZE
(
x
))
{
case
0
:
return
0
;
case
1
:
return
+
({{
TYPE
}})
((
PyLongObject
*
)
x
)
->
ob_digit
[
0
];
case
-
1
:
return
-
({{
TYPE
}})
((
PyLongObject
*
)
x
)
->
ob_digit
[
0
];
}
switch
(
Py_SIZE
(
x
))
{
case
0
:
return
0
;
case
1
:
__PYX_VERIFY_RETURN_INT
({{
TYPE
}},
digit
,
+
(((
PyLongObject
*
)
x
)
->
ob_digit
[
0
]));
case
-
1
:
__PYX_VERIFY_RETURN_INT
({{
TYPE
}},
sdigit
,
-
(
sdigit
)
((
PyLongObject
*
)
x
)
->
ob_digit
[
0
]);
}
#endif
#endif
if
(
sizeof
({{
TYPE
}})
<=
sizeof
(
long
))
{
__PYX_VERIFY_RETURN_INT
({{
TYPE
}},
long
,
PyLong_AsLong
)
__PYX_VERIFY_RETURN_INT
({{
TYPE
}},
long
,
PyLong_AsLong
(
x
)
)
}
else
if
(
sizeof
({{
TYPE
}})
<=
sizeof
(
long
long
))
{
__PYX_VERIFY_RETURN_INT
({{
TYPE
}},
long
long
,
PyLong_AsLongLong
)
__PYX_VERIFY_RETURN_INT
({{
TYPE
}},
long
long
,
PyLong_AsLongLong
(
x
)
)
}
}
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment