mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-10 05:50:26 +02:00
Code Activity

VM: Avoid signed overflows in 'add1' and 'sub1'.

Browse source 
* libguile/vm-i-scheme.c (INUM_STEP): New macro.
  (add1, sub1): Avoid signed overflows, and use INUM_STEP.
This commit is contained in:
Mark H Weaver 2013-08-03 14:46:40 -04:00
parent 478fa0d530
commit cb1482e719
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
libguile/vm-i-scheme.c
View file

@ -207,10 +207,14 @@ VM_DEFINE_FUNCTION (149, ge, "ge?", 2)
/* The maximum/minimum tagged integers. */ /* The maximum/minimum tagged integers. */
#undef INUM_MAX #undef INUM_MAX
#undef INUM_MIN #undef INUM_MIN
#undef INUM_STEP
#define INUM_MAX \ #define INUM_MAX \
((scm_t_signed_bits) SCM_UNPACK (SCM_I_MAKINUM (SCM_MOST_POSITIVE_FIXNUM))) ((scm_t_signed_bits) SCM_UNPACK (SCM_I_MAKINUM (SCM_MOST_POSITIVE_FIXNUM)))
#define INUM_MIN \ #define INUM_MIN \
((scm_t_signed_bits) SCM_UNPACK (SCM_I_MAKINUM (SCM_MOST_NEGATIVE_FIXNUM))) ((scm_t_signed_bits) SCM_UNPACK (SCM_I_MAKINUM (SCM_MOST_NEGATIVE_FIXNUM)))
#define INUM_STEP \
((scm_t_signed_bits) SCM_UNPACK (SCM_INUM1) \
- (scm_t_signed_bits) SCM_UNPACK (SCM_INUM0))
#undef FUNC2 #undef FUNC2
#define FUNC2(CFUNC,SFUNC) \ #define FUNC2(CFUNC,SFUNC) \
@ -294,15 +298,14 @@ VM_DEFINE_FUNCTION (151, add1, "add1", 1)
{ {
ARGS1 (x); ARGS1 (x);
/* Check for overflow. */ /* Check for overflow. We must avoid overflow in the signed
if (SCM_LIKELY ((scm_t_intptr) SCM_UNPACK (x) < INUM_MAX)) addition below, even if X is not an inum. */
if (SCM_LIKELY ((scm_t_signed_bits) SCM_UNPACK (x) <= INUM_MAX - INUM_STEP))
{ {
SCM result; SCM result;
/* Add the integers without untagging. */ /* Add 1 to the integer without untagging. */
result = SCM_PACK ((scm_t_intptr) SCM_UNPACK (x) result = SCM_PACK ((scm_t_signed_bits) SCM_UNPACK (x) + INUM_STEP);
+ (scm_t_intptr) SCM_UNPACK (SCM_I_MAKINUM (1))
- scm_tc2_int);
if (SCM_LIKELY (SCM_I_INUMP (result))) if (SCM_LIKELY (SCM_I_INUMP (result)))
RETURN (result); RETURN (result);
@ -328,15 +331,14 @@ VM_DEFINE_FUNCTION (153, sub1, "sub1", 1)
{ {
ARGS1 (x); ARGS1 (x);
/* Check for underflow. */ /* Check for overflow. We must avoid overflow in the signed
if (SCM_LIKELY ((scm_t_intptr) SCM_UNPACK (x) > INUM_MIN)) subtraction below, even if X is not an inum. */
if (SCM_LIKELY ((scm_t_signed_bits) SCM_UNPACK (x) >= INUM_MIN + INUM_STEP))
{ {
SCM result; SCM result;
/* Substract the integers without untagging. */ /* Substract 1 from the integer without untagging. */
result = SCM_PACK ((scm_t_intptr) SCM_UNPACK (x) result = SCM_PACK ((scm_t_signed_bits) SCM_UNPACK (x) - INUM_STEP);
- (scm_t_intptr) SCM_UNPACK (SCM_I_MAKINUM (1))
+ scm_tc2_int);
if (SCM_LIKELY (SCM_I_INUMP (result))) if (SCM_LIKELY (SCM_I_INUMP (result)))
RETURN (result); RETURN (result);