Mercurial > emacs
changeset 13365:2cd15d90fec6
(SHORTBITS, INTBITS, LONGBITS): Deleted; now in config.h
Used new names for those macros in all references.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Tue, 31 Oct 1995 05:22:28 +0000 |
| parents | a568560d232f |
| children | c8b89eac76b2 |
| files | src/m/alpha.h src/m/convex.h src/m/hp800.h src/m/intel386.h src/m/iris4d.h src/m/iris5d.h src/m/mips-siemens.h src/m/mips.h |
| diffstat | 8 files changed, 20 insertions(+), 100 deletions(-) [+] |
line wrap: on
line diff
--- a/src/m/alpha.h Tue Oct 31 02:48:28 1995 +0000 +++ b/src/m/alpha.h Tue Oct 31 05:22:28 1995 +0000 @@ -28,14 +28,7 @@ */ -/* The following three symbols give information on - the size of various data types. */ - -#define SHORTBITS 16 /* Number of bits in a short */ - -#define INTBITS 32 /* Number of bits in an int */ - -#define LONGBITS 64 /* Number of bits in a long */ +#define BITS_PER_LONG 64 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word is the most significant byte. */ @@ -206,7 +199,7 @@ /* Define XINT and XUINT so that they can take arguments of type int */ -#define XINT(a) (((long) (a) << (LONGBITS - VALBITS)) >> (LONGBITS - VALBITS)) +#define XINT(a) (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS)) #define XUINT(a) ((long) (a) & VALMASK) /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
--- a/src/m/convex.h Tue Oct 31 02:48:28 1995 +0000 +++ b/src/m/convex.h Tue Oct 31 05:22:28 1995 +0000 @@ -22,15 +22,6 @@ operating system this machine is likely to run. USUAL-OPSYS="bsd4-3" */ -/* The following three symbols give information on - the size of various data types. */ - -#define SHORTBITS 16 /* Number of bits in a short */ - -#define INTBITS 32 /* Number of bits in an int */ - -#define LONGBITS 32 /* Number of bits in a long */ - /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word is the most significant byte. */ @@ -115,7 +106,7 @@ /* #define NO_REMAP */ /* Addresses on the Convex have the high bit set. */ -#define DATA_SEG_BITS (1 << (INTBITS-1)) +#define DATA_SEG_BITS (1 << (BITS_PER_INT-1)) /* Right shift is logical shift. And the usual way of handling such machines, which involves
--- a/src/m/hp800.h Tue Oct 31 02:48:28 1995 +0000 +++ b/src/m/hp800.h Tue Oct 31 05:22:28 1995 +0000 @@ -22,15 +22,6 @@ operating system this machine is likely to run. USUAL-OPSYS="hpux" */ -/* The following three symbols give information on - the size of various data types. */ - -#define SHORTBITS 16 /* Number of bits in a short */ - -#define INTBITS 32 /* Number of bits in an int */ - -#define LONGBITS 32 /* Number of bits in a long */ - /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word is the most significant byte. */ @@ -133,16 +124,16 @@ but these are faster because the constants are short. */ -#define XUINT(a) (((unsigned)(a) << INTBITS-VALBITS) >> INTBITS-VALBITS) +#define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS) #define XSET(var, type, ptr) \ - ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << INTBITS-VALBITS) >> INTBITS-VALBITS)) + ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS)) #define XMARKBIT(a) ((a) < 0) #define XSETMARKBIT(a,b) ((a) = ((b) ? (a)|MARKBIT : (a) & ~MARKBIT)) #if 0 /* Loses when sign bit of type field is set. */ -#define XUNMARK(a) ((a) = (((a) << INTBITS-GCTYPEBITS-VALBITS) >> INTBITS-GCTYPEBITS-VALBITS)) +#define XUNMARK(a) ((a) = (((a) << BITS_PER_INT-GCTYPEBITS-VALBITS) >> BITS_PER_INT-GCTYPEBITS-VALBITS)) #endif /* The symbol in the kernel where the load average is found
--- a/src/m/intel386.h Tue Oct 31 02:48:28 1995 +0000 +++ b/src/m/intel386.h Tue Oct 31 05:22:28 1995 +0000 @@ -48,25 +48,6 @@ Minor changes merged in 19.1. NOTE-END */ -/* The following three symbols give information on - the size of various data types. */ - - -/* Linux defines these in <values.h>, but they can't be used in #if's. - #include it now so we know we've overridden it once and for all. */ -#ifdef linux -#include <values.h> -#undef SHORTBITS -#undef INTBITS -#undef LONGBITS -#endif - -#define SHORTBITS 16 /* Number of bits in a short */ - -#define INTBITS 32 /* Number of bits in an int */ - -#define LONGBITS 32 /* Number of bits in a long */ - /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word is the most significant byte. */
--- a/src/m/iris4d.h Tue Oct 31 02:48:28 1995 +0000 +++ b/src/m/iris4d.h Tue Oct 31 05:22:28 1995 +0000 @@ -18,15 +18,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* The following three symbols give information on - the size of various data types. */ - -#define SHORTBITS 16 /* Number of bits in a short */ - -#define INTBITS 32 /* Number of bits in an int */ - -#define LONGBITS 32 /* Number of bits in a long */ - /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word is the most significant byte. */ @@ -177,14 +168,14 @@ /* The standard definitions of these macros would work ok, but these are faster because the constants are short. */ -#define XUINT(a) (((unsigned)(a) << INTBITS-VALBITS) >> INTBITS-VALBITS) +#define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS) #define XSET(var, type, ptr) \ - ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << INTBITS-VALBITS) >> INTBITS-VALBITS)) + ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS)) #define XMARKBIT(a) ((a) < 0) #define XSETMARKBIT(a,b) ((a) = ((a) & ~MARKBIT) | ((b) ? MARKBIT : 0)) -#define XUNMARK(a) ((a) = (((unsigned)(a) << INTBITS-GCTYPEBITS-VALBITS) >> INTBITS-GCTYPEBITS-VALBITS)) +#define XUNMARK(a) ((a) = (((unsigned)(a) << BITS_PER_INT-GCTYPEBITS-VALBITS) >> BITS_PER_INT-GCTYPEBITS-VALBITS)) #ifndef __GNUC__ /* Turn off some "helpful" error checks for type mismatches
--- a/src/m/iris5d.h Tue Oct 31 02:48:28 1995 +0000 +++ b/src/m/iris5d.h Tue Oct 31 05:22:28 1995 +0000 @@ -22,15 +22,6 @@ operating system this machine is likely to run. USUAL-OPSYS="irix3-3" */ -/* The following three symbols give information on - the size of various data types. */ - -#define SHORTBITS 16 /* Number of bits in a short */ - -#define INTBITS 32 /* Number of bits in an int */ - -#define LONGBITS 32 /* Number of bits in a long */ - /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word is the most significant byte. */ @@ -177,14 +168,14 @@ /* The standard definitions of these macros would work ok, but these are faster because the constants are short. */ -#define XUINT(a) (((unsigned)(a) << INTBITS-VALBITS) >> INTBITS-VALBITS) +#define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS) #define XSET(var, type, ptr) \ - ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << INTBITS-VALBITS) >> INTBITS-VALBITS)) + ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS)) #define XMARKBIT(a) ((a) < 0) #define XSETMARKBIT(a,b) ((a) = ((a) & ~MARKBIT) | ((b) ? MARKBIT : 0)) -#define XUNMARK(a) ((a) = (((unsigned)(a) << INTBITS-GCTYPEBITS-VALBITS) >> INTBITS-GCTYPEBITS-VALBITS)) +#define XUNMARK(a) ((a) = (((unsigned)(a) << BITS_PER_INT-GCTYPEBITS-VALBITS) >> BITS_PER_INT-GCTYPEBITS-VALBITS)) #ifndef __GNUC__ /* Turn off some "helpful" error checks for type mismatches
--- a/src/m/mips-siemens.h Tue Oct 31 02:48:28 1995 +0000 +++ b/src/m/mips-siemens.h Tue Oct 31 05:22:28 1995 +0000 @@ -34,15 +34,6 @@ With this the file mips-siemens.h is obsolete. NOTE-END */ -/* The following three symbols give information on - the size of various data types. */ - -#define SHORTBITS 16 /* Number of bits in a short */ - -#define INTBITS 32 /* Number of bits in an int */ - -#define LONGBITS 32 /* Number of bits in a long */ - /* Define BIG_ENDIAN iff lowest-numbered byte in a word is the most significant byte. */ @@ -177,12 +168,12 @@ /* The standard definitions of these macros would work ok, but these are faster because the constants are short. */ -#define XUINT(a) (((unsigned)(a) << (INTBITS-VALBITS)) >> (INTBITS-VALBITS)) +#define XUINT(a) (((unsigned)(a) << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS)) #define XSET(var, type, ptr) \ ((var) = \ ((int)(type) << VALBITS) \ - + (((unsigned) (ptr) << (INTBITS-VALBITS)) >> (INTBITS-VALBITS))) + + (((unsigned) (ptr) << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS))) #define XSETINT(a, b) XSET(a, XTYPE(a), b) #define XSETUINT(a, b) XSET(a, XTYPE(a), b) @@ -190,6 +181,6 @@ #define XUNMARK(a) \ ((a) = \ - (((unsigned)(a) << (INTBITS-GCTYPEBITS-VALBITS)) \ - >> (INTBITS-GCTYPEBITS-VALBITS))) + (((unsigned)(a) << (BITS_PER_INT-GCTYPEBITS-VALBITS)) \ + >> (BITS_PER_INT-GCTYPEBITS-VALBITS)))
--- a/src/m/mips.h Tue Oct 31 02:48:28 1995 +0000 +++ b/src/m/mips.h Tue Oct 31 05:22:28 1995 +0000 @@ -27,15 +27,6 @@ Note that the proper m- file for the Decstation is m-pmax.h. NOTE-END */ -/* The following three symbols give information on - the size of various data types. */ - -#define SHORTBITS 16 /* Number of bits in a short */ - -#define INTBITS 32 /* Number of bits in an int */ - -#define LONGBITS 32 /* Number of bits in a long */ - /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word is the most significant byte. */ @@ -169,17 +160,17 @@ /* The standard definitions of these macros would work ok, but these are faster because the constants are short. */ -#define XUINT(a) (((unsigned)(a) << (INTBITS-VALBITS)) >> (INTBITS-VALBITS)) +#define XUINT(a) (((unsigned)(a) << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS)) #define XSET(var, type, ptr) \ ((var) = \ ((int)(type) << VALBITS) \ - + (((unsigned) (ptr) << (INTBITS-VALBITS)) >> (INTBITS-VALBITS))) + + (((unsigned) (ptr) << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS))) #define XUNMARK(a) \ ((a) = \ - (((unsigned)(a) << (INTBITS-GCTYPEBITS-VALBITS)) \ - >> (INTBITS-GCTYPEBITS-VALBITS))) + (((unsigned)(a) << (BITS_PER_INT-GCTYPEBITS-VALBITS)) \ + >> (BITS_PER_INT-GCTYPEBITS-VALBITS))) #ifndef NEWSOS5 #ifdef USG