From cf65141f154651115028d6456a1d7582d30b2083 Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Sat, 30 May 2020 15:09:33 -0700 Subject: many bug fixes --- sys/cmd/cc/bits.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) (limited to 'sys/cmd/cc/bits.c') diff --git a/sys/cmd/cc/bits.c b/sys/cmd/cc/bits.c index 2fe7295..479ddbb 100644 --- a/sys/cmd/cc/bits.c +++ b/sys/cmd/cc/bits.c @@ -16,34 +16,34 @@ enum * enumerated type specifers * see https://en.wikipedia.org/wiki/C_data_types */ -#define VOID X(Tvoid, 1) +#define VOID X(Tvoid, 2) -#define BOOL X(Tbool, 2) -#define CHAR X(Tchar, 3) -#define SCHAR X(Tsign|Tchar, 4) -#define UCHAR X(Tunsign|Tchar, 5) +#define BOOL X(Tbool, 3) +#define CHAR X(Tchar, 4) +#define SCHAR X(Tsign|Tchar, 5) +#define UCHAR X(Tunsign|Tchar, 6) -#define SHORT X(Tshort, 6), X(Tshort|Tint, 6) -#define SSHORT X(Tsign|Tshort, 7), X(Tsign|Tshort|Tint, 7) -#define USHORT X(Tunsign|Tshort, 8), X(Tunsign|Tshort|Tint, 8) +#define SHORT X(Tshort, 7), X(Tshort|Tint, 7) +#define SSHORT X(Tsign|Tshort, 8), X(Tsign|Tshort|Tint, 8) +#define USHORT X(Tunsign|Tshort, 9), X(Tunsign|Tshort|Tint, 9) -#define INT X(0, 9), X(Tint, 9) -#define SINT X(Tsign, 10), X(Tsign|Tint, 10) -#define UINT X(Tunsign, 11), X(Tunsign|Tint, 11) +#define INT X(0, 10), X(Tint, 10) +#define SINT X(Tsign, 11), X(Tsign|Tint, 11) +#define UINT X(Tunsign, 12), X(Tunsign|Tint, 12) -#define LONG X(Tlong, 12), X(Tlong|Tint, 12) -#define SLONG X(Tsign|Tlong, 13), X(Tsign|Tlong|Tint, 13) -#define ULONG X(Tunsign|Tlong, 14), X(Tunsign|Tlong|Tint, 14) +#define LONG X(Tlong, 13), X(Tlong|Tint, 13) +#define SLONG X(Tsign|Tlong, 14), X(Tsign|Tlong|Tint, 14) +#define ULONG X(Tunsign|Tlong, 15), X(Tunsign|Tlong|Tint, 15) -#define VLONG X(Tvlong, 15), X(Tvlong|Tint, 15) -#define SVLONG X(Tsign|Tvlong, 16), X(Tsign|Tvlong|Tint, 16) -#define UVLONG X(Tunsign|Tvlong, 16), X(Tunsign|Tvlong|Tint, 17) +#define VLONG X(Tvlong, 16), X(Tvlong|Tint, 16) +#define SVLONG X(Tsign|Tvlong, 17), X(Tsign|Tvlong|Tint, 17) +#define UVLONG X(Tunsign|Tvlong, 18), X(Tunsign|Tvlong|Tint, 18) -#define FLOAT X(Tfloat, 18) -#define DOUBLE X(Tdouble, 19) -#define LONGDB X(Tlong|Tdouble, 20) -#define COMPLEX X(Tcmplx, 21) -#define IMAGINARY X(Timag, 22) +#define FLOAT X(Tfloat, 19) +#define DOUBLE X(Tdouble, 20) +#define LONGDB X(Tlong|Tdouble, 21) +#define COMPLEX X(Tcmplx, 22) +#define IMAGINARY X(Timag, 23) /* fixed width definitions */ #define DEF(sz, aln, mx, sgn) {.size=sz, .align=aln, .max=mx, .sign=sgn } @@ -92,6 +92,7 @@ Type pointer = {.size=8, .align=8, .max=0xffffffffffffffff, .sign=0}; #define TYPE(a, ...) a, Type basetypes[] = { { 0 }, /* sentinel value for bad types */ + { 0 }, /* sentinel value for variadic args */ TYPES }; #undef TYPE -- cgit v1.2.1