[Python-checkins] CVS: python/dist/src/Include pyport.h,NONE,2.1 Python.h,2.21,2.22 longintrepr.h,2.8,2.9

[Tim Peters]

Update of /cvsroot/python/python/dist/src/Include
In directory slayer.i.sourceforge.net:/tmp/cvs-serv5529/src/Include

Modified Files:
	Python.h longintrepr.h 
Added Files:
	pyport.h 
Log Message:
Cray J90 fixes for long ints.
This was a convenient excuse to create the pyport.h file recently
discussed!
Please use new Py_ARITHMETIC_RIGHT_SHIFT when right-shifting a
signed int and you *need* sign-extension.  This is #define'd in
pyport.h, keying off new config symbol SIGNED_RIGHT_SHIFT_ZERO_FILLS.
If you're running on a platform that needs that symbol #define'd,
the std tests never would have worked for you (in particular,
at least test_long would have failed).
The autoconfig stuff got added to Python after my Unix days, so
I don't know how that works.  Would someone please look into doing
& testing an auto-config of the SIGNED_RIGHT_SHIFT_ZERO_FILLS
symbol?  It needs to be defined if & only if, e.g., (-1) >> 3 is
not -1.


--- NEW FILE ---
/***********************************************************
Copyright (c) 2000, BeOpen.com.
All rights reserved.

See the file "Misc/COPYRIGHT" for information on usage and
redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
******************************************************************/

#ifndef Py_PYPORT_H
#define Py_PYPORT_H 1

/**************************************************************************
Symbols and macros to supply platform-independent interfaces to basic
C-language operations whose spellings vary across platforms.

Please try to make documentation here as clear as possible:  by definition,
the stuff here is trying to illuminate C's darkest corners.

Config #defines referenced here:

SIGNED_RIGHT_SHIFT_ZERO_FILLS
Meaning:  To be defined iff i>>j does not extend the sign bit when i is a
          signed integral type and i < 0.
Used in:  Py_ARITHMETIC_RIGHT_SHIFT
**************************************************************************/


#ifdef __cplusplus
extern "C" {
#endif

/* Py_ARITHMETIC_RIGHT_SHIFT
 * C doesn't define whether a right-shift of a signed integer sign-extends
 * or zero-fills.  Here a macro to force sign extension:
 * Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J)
 *    Return I >> J, forcing sign extension.
 * Requirements:
 *    I is of basic signed type TYPE (char, short, int, long, or long long).
 *    TYPE is one of char, short, int, long, or long long, although long long
 *    must not be used except on platforms that support it.
 *    J is an integer >= 0 and strictly less than the number of bits in TYPE
 *    (because C doesn't define what happens for J outside that range either).
 * Caution:
 *    I may be evaluated more than once.
 */
#ifdef SIGNED_RIGHT_SHIFT_ZERO_FILLS
#define Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) \
	((I) < 0 ? ~((~(unsigned TYPE)(I)) >> (J)) : (I) >> (J))
#else
#define Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) ((I) >> (J))
#endif

#ifdef __cplusplus
}
#endif

#endif /* Py_PYPORT_H */

Index: Python.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/Python.h,v
retrieving revision 2.21
retrieving revision 2.22
diff -C2 -r2.21 -r2.22
*** Python.h	2000/07/07 11:24:49	2.21
--- Python.h	2000/07/08 04:17:21	2.22
***************
*** 32,35 ****
--- 32,36 ----
  #include "patchlevel.h"
  #include "config.h"
+ #include "pyport.h"
  
  /* config.h may or may not define DL_IMPORT */

Index: longintrepr.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/longintrepr.h,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -r2.8 -r2.9
*** longintrepr.h	2000/07/07 15:53:28	2.8
--- longintrepr.h	2000/07/08 04:17:21	2.9
***************
*** 19,23 ****
  /* Parameters of the long integer representation.
     These shouldn't have to be changed as C should guarantee that a short
!    contains at least 16 bits, but it's made changeable any way.
     Note: 'digit' should be able to hold 2*MASK+1, and 'twodigits'
     should be able to hold the intermediate results in 'mul'
--- 19,23 ----
  /* Parameters of the long integer representation.
     These shouldn't have to be changed as C should guarantee that a short
!    contains at least 16 bits, but it's made changeable anyway.
     Note: 'digit' should be able to hold 2*MASK+1, and 'twodigits'
     should be able to hold the intermediate results in 'mul'
***************
*** 29,34 ****
  typedef unsigned short digit;
  typedef unsigned int wdigit; /* digit widened to parameter size */
! typedef unsigned long twodigits;
! typedef long stwodigits; /* signed variant of twodigits */
  
  #define SHIFT	15
--- 29,35 ----
  typedef unsigned short digit;
  typedef unsigned int wdigit; /* digit widened to parameter size */
! #define BASE_TWODIGITS_TYPE long
! typedef unsigned BASE_TWODIGITS_TYPE twodigits;
! typedef BASE_TWODIGITS_TYPE stwodigits; /* signed variant of twodigits */
  
  #define SHIFT	15