mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Better way to handle 64-bit ints, keeping gcc -Wall happy.

Browse source 
Tested with AMK's help.
This commit is contained in:
Guido van Rossum 1996-12-10 15:39:04 +00:00
parent 1a2c5cbcc4
commit c1547d930f
1 changed files with 18 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Python/marshal.c
View file

@ -127,17 +127,16 @@ w_long(x, p)
w_byte((int)((x>>24) & 0xff), p); w_byte((int)((x>>24) & 0xff), p);
} }
#if SIZEOF_LONG > 4
static void static void
w_long64(x, p) w_long64(x, p)
long x; long x;
WFILE *p; WFILE *p;
{ {
w_long(x, p); w_long(x, p);
w_byte((int)((x>>32) & 0xff), p); w_long(x>>32, p);
w_byte((int)((x>>40) & 0xff), p);
w_byte((int)((x>>48) & 0xff), p);
w_byte((int)((x>>56) & 0xff), p);
} }
#endif
static void static void
w_object(v, p) w_object(v, p)
@ -154,12 +153,15 @@ w_object(v, p)
w_byte(TYPE_ELLIPSIS, p); w_byte(TYPE_ELLIPSIS, p);
else if (is_intobject(v)) { else if (is_intobject(v)) {
long x = GETINTVALUE((intobject *)v); long x = GETINTVALUE((intobject *)v);
#if SIZEOF_LONG > 4
long y = x>>31; long y = x>>31;
if (y && y != -1) { if (y && y != -1) {
w_byte(TYPE_INT64, p); w_byte(TYPE_INT64, p);
w_long64(x, p); w_long64(x, p);
} }
else { else
#endif
{
w_byte(TYPE_INT, p); w_byte(TYPE_INT, p);
w_long(x, p); w_long(x, p);
} }
@ -328,9 +330,11 @@ r_long(p)
x |= (long)rs_byte(p) << 16; x |= (long)rs_byte(p) << 16;
x |= (long)rs_byte(p) << 24; x |= (long)rs_byte(p) << 24;
} }
#if SIZEOF_LONG > 4
/* Sign extension for 64-bit machines */ /* Sign extension for 64-bit machines */
x <<= (8*sizeof(long) - 32); x <<= (8*sizeof(long) - 32);
x >>= (8*sizeof(long) - 32); x >>= (8*sizeof(long) - 32);
#endif
return x; return x;
} }
@ -339,35 +343,19 @@ r_long64(p)
RFILE *p; RFILE *p;
{ {
register long x; register long x;
register FILE *fp = p->fp; x = r_long(p);
if (sizeof(long) < 8) { #if SIZEOF_LONG > 4
x = (x & 0xFFFFFFFF) | (r_long(p) << 32);
#else
if (r_long(p) != 0) {
object *f = sysget("stderr"); object *f = sysget("stderr");
err_clear(); err_clear();
if (f != NULL) { if (f != NULL)
writestring( writestring(
"Warning: un-marshal 64-bit int in 32-bit mode\n", f); "Warning: un-marshal 64-bit int in 32-bit mode\n",
} f);
}
if (fp) {
x = getc(fp);
x |= (long)getc(fp) << 8;
x |= (long)getc(fp) << 16;
x |= (long)getc(fp) << 24;
x |= (long)getc(fp) << 32;
x |= (long)getc(fp) << 40;
x |= (long)getc(fp) << 48;
x |= (long)getc(fp) << 56;
}
else {
x = rs_byte(p);
x |= (long)rs_byte(p) << 8;
x |= (long)rs_byte(p) << 16;
x |= (long)rs_byte(p) << 24;
x |= (long)rs_byte(p) << 32;
x |= (long)rs_byte(p) << 40;
x |= (long)rs_byte(p) << 48;
x |= (long)rs_byte(p) << 56;
} }
#endif
return x; return x;
} }