From 680d60678b273f1ff20b013b24954773f76b4e1d Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Fri, 29 May 2020 14:40:50 -0700 Subject: checkin: before fix of stale type pointer bug --- sys/cmd/cc/bits.c | 70 +++++++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'sys/cmd/cc/bits.c') diff --git a/sys/cmd/cc/bits.c b/sys/cmd/cc/bits.c index 19adf52..a13938c 100644 --- a/sys/cmd/cc/bits.c +++ b/sys/cmd/cc/bits.c @@ -5,7 +5,7 @@ enum { - arch·x64, + archx64, numarch, }; @@ -46,47 +46,47 @@ enum #define IMAGINARY X(Timag, 21) /* fixed width definitions */ -#define DEF(name, sz, aln, mx, sgn) {.ident=#name, .size=sz, .align=aln, .max=mx, .sign=sgn } +#define DEF(sz, aln, mx, sgn) {.size=sz, .align=aln, .max=mx, .sign=sgn } -#define INT8(name) DEF(name, 1, 1, 0x7f, 0) -#define UINT8(name) DEF(name, 1, 1, 0xff, 1) +#define INT8 DEF(1, 1, 0x7fff, 0) +#define UINT8 DEF(1, 1, 0xffff, 1) -#define INT16(name) DEF(name, 2, 2, 0x7fff, 0) -#define UINT16(name) DEF(name, 2, 2, 0xffff, 1) +#define INT16 DEF(2, 2, 0x7fff, 0) +#define UINT16 DEF(2, 2, 0xffff, 1) -#define INT32(name) DEF(name, 4, 4, 0x7fffffff, 0) -#define UINT32(name) DEF(name, 4, 4, 0xffffffff, 1) +#define INT32 DEF(4, 4, 0x7fffffff, 0) +#define UINT32 DEF(4, 4, 0xffffffff, 1) -#define INT64(name) DEF(name, 8, 8, 0x7fffffffffffffff, 0) -#define UINT64(name) DEF(name, 8, 8, 0xffffffffffffffff, 1) +#define INT64 DEF(8, 8, 0x7fffffffffffffff, 0) +#define UINT64 DEF(8, 8, 0xffffffffffffffff, 1) /* architecture specific definitions */ // TODO: max value should be able to take floats -#define TYPES \ - TYPE(DEF(void, 0, 0, 0, 0), VOID) \ - TYPE(INT8(bool), BOOL) \ - TYPE(UINT8(char), CHAR) \ - TYPE(INT8(signed char), SCHAR) \ - TYPE(UINT8(unsigned char), UCHAR) \ - TYPE(INT16(short), SHORT) \ - TYPE(INT16(signed short), SSHORT) \ - TYPE(UINT16(unsigned short), USHORT) \ - TYPE(INT32(int), INT) \ - TYPE(INT32(signed int), SINT) \ - TYPE(UINT32(unsigned int), UINT) \ - TYPE(INT64(long), LONG) \ - TYPE(INT64(signed long), SLONG) \ - TYPE(UINT64(unsigned long), ULONG) \ - TYPE(INT64(long long), VLONG) \ - TYPE(INT64(signed long long), SVLONG) \ - TYPE(UINT64(unsigned long long), UVLONG) \ - TYPE(DEF(float, 4, 4, 0, 0), FLOAT) \ - TYPE(DEF(double, 8, 8, 0, 0), DOUBLE) \ - TYPE(DEF(long double, 16, 16, 0, 0), LONGDB) \ - TYPE(DEF(complex, 8, 8, 0, 0), COMPLEX) \ - TYPE(DEF(imaginary, 4, 4, 0, 0), IMAGINARY) \ - -Type pointer = {.ident = "", .size=8, .align=8, .max=0xffffffffffffffff, .sign=0}; +#define TYPES \ + TYPE(DEF(0, 0, 0, 0), VOID) \ + TYPE(INT8, BOOL) \ + TYPE(UINT8, CHAR) \ + TYPE(INT8, SCHAR) \ + TYPE(UINT8, UCHAR) \ + TYPE(INT16, SHORT) \ + TYPE(INT16, SSHORT) \ + TYPE(UINT16, USHORT) \ + TYPE(INT32, INT) \ + TYPE(INT32, SINT) \ + TYPE(UINT32, UINT) \ + TYPE(INT64, LONG) \ + TYPE(INT64, SLONG) \ + TYPE(UINT64, ULONG) \ + TYPE(INT64, VLONG) \ + TYPE(INT64, SVLONG) \ + TYPE(UINT64, UVLONG) \ + TYPE(DEF(4, 4, 0, 0), FLOAT) \ + TYPE(DEF(8, 8, 0, 0), DOUBLE) \ + TYPE(DEF(16, 16, 0, 0), LONGDB) \ + TYPE(DEF(8, 8, 0, 0), COMPLEX) \ + TYPE(DEF(4, 4, 0, 0), IMAGINARY) \ + +Type pointer = {.size=8, .align=8, .max=0xffffffffffffffff, .sign=0}; /* pack architecture specific definitions into exported arrays */ #define TYPE(a, ...) a, -- cgit v1.2.1