|
From: Martin R. <ru...@us...> - 2010-04-26 14:40:56
|
Update of /cvsroot/foo/fooelk/include In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30431/include Modified Files: object.h Log Message: incorporated revision level r258 from original elk-trunk Index: object.h =================================================================== RCS file: /cvsroot/foo/fooelk/include/object.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** object.h 10 Aug 2004 02:28:40 -0000 1.2 --- object.h 26 Apr 2010 14:40:48 -0000 1.3 *************** *** 39,43 **** #define FIXBITS (8 * (int)sizeof(int)) ! #define SIGNBIT ((unsigned)1 << (FIXBITS-1)) #define CONSTBIT 1 #define TYPEBITS (8 * (int)sizeof(int) - 1) --- 39,43 ---- #define FIXBITS (8 * (int)sizeof(int)) ! #define SIGNBIT ((unsigned int)1 << (FIXBITS-1)) #define CONSTBIT 1 #define TYPEBITS (8 * (int)sizeof(int) - 1) *************** *** 52,57 **** #define CHAR(x) ((int)(x).data) ! #define POINTER(x) ((void *)(intptr_t)(x).data) ! #define SETPOINTER(x,p) ((x).data = (intptr_t)(void *)(p)) #define SET(x,t,p) ((x).tag = (int)t << 1, (x).data = (p)) --- 52,57 ---- #define CHAR(x) ((int)(x).data) ! #define POINTER(x) ((void *)(uintptr_t)(x).data) ! #define SETPOINTER(x,p) ((x).data = (uintptr_t)(void *)(p)) #define SET(x,t,p) ((x).tag = (int)t << 1, (x).data = (p)) *************** *** 69,75 **** typedef int gcspace_t; /* type for space and type arrays */ ! typedef intptr_t gcptr_t; /* type for pointers */ ! typedef long int pageno_t; /* type for page numbers */ ! typedef intptr_t addrarith_t; /* type for address arithmetic */ extern gcspace_t *space; --- 69,75 ---- typedef int gcspace_t; /* type for space and type arrays */ ! typedef uintptr_t gcptr_t; /* type for pointers */ ! typedef uintptr_t pageno_t; /* type for page numbers */ ! typedef uintptr_t addrarith_t; /* type for address arithmetic */ extern gcspace_t *space; |