[Python-checkins] CVS: python/dist/src/Python marshal.c,1.65,1.66

[Tim Peters]

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv27201/Python

Modified Files:
	marshal.c 
Log Message:
marshal.c r_long64:  When reading a TYPE_INT64 value on a box with 32-bit
ints, convert to PyLong (rather than throwing away the high-order 32 bits).


Index: marshal.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/marshal.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** marshal.c	2001/08/17 18:39:25	1.65
--- marshal.c	2001/08/29 02:28:41	1.66
***************
*** 343,363 ****
  }
  
! static long
  r_long64(RFILE *p)
  {
! 	register long x;
! 	x = r_long(p);
  #if SIZEOF_LONG > 4
! 	x = (x & 0xFFFFFFFFL) | (r_long(p) << 32);
  #else
! 	if (r_long(p) != 0) {
! 		PyObject *f = PySys_GetObject("stderr");
! 		if (f != NULL)
! 			(void) PyFile_WriteString(
! 			    "Warning: un-marshal 64-bit int in 32-bit mode\n",
! 			    f);
  	}
  #endif
- 	return x;
  }
  
--- 343,375 ----
  }
  
! /* r_long64 deals with the TYPE_INT64 code.  On a machine with
!    sizeof(long) > 4, it returns a Python int object, else a Python long
!    object.  Note that w_long64 writes out TYPE_INT if 32 bits is enough,
!    so there's no inefficiency here in returning a PyLong on 32-bit boxes
!    for everything written via TYPE_INT64 (i.e., if an int is written via
!    TYPE_INT64, it *needs* more than 32 bits).
! */
! static PyObject *
  r_long64(RFILE *p)
  {
! 	long lo4 = r_long(p);
! 	long hi4 = r_long(p);
  #if SIZEOF_LONG > 4
! 	long x = (hi4 << 32) | (lo4 & 0xFFFFFFFFL);
! 	return PyInt_FromLong(x);
  #else
! 	unsigned char buf[8];
! 	int one = 1;
! 	int is_little_endian = (int)*(char*)&one;
! 	if (is_little_endian) {
! 		memcpy(buf, &lo4, 4);
! 		memcpy(buf+4, &hi4, 4);
! 	}
! 	else {
! 		memcpy(buf, &hi4, 4);
! 		memcpy(buf+4, &lo4, 4);
  	}
+ 	return _PyLong_FromByteArray(buf, 8, is_little_endian, 1);
  #endif
  }
  
***************
*** 395,399 ****
  
  	case TYPE_INT64:
! 		return PyInt_FromLong(r_long64(p));
  
  	case TYPE_LONG:
--- 407,411 ----
  
  	case TYPE_INT64:
! 		return r_long64(p);
  
  	case TYPE_LONG: