scc

commit 9a456e19d03b2c6e68182cac6e8fbd77eecfc90e
parent 1b4f88745ddce9a4870c4cf1c9c2877486c2c4bb
Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date:   Mon, 25 Jan 2016 17:53:16 +0100

[cc1] Remove non needed defines from arch.h

These defines were needed in other time, before of having a full multi-support
implemented. In this case they were not needed and it was hidden a bit the sizes
of the primitive types.

Diffstat:
M
cc1/arch/amd64-sysv/arch.c
 | 
26
+++++++++++++-------------
M
cc1/arch/amd64-sysv/arch.h
 | 
13
+------------
M
cc1/arch/i386-sysv/arch.c
 | 
26
+++++++++++++-------------
M
cc1/arch/i386-sysv/arch.h
 | 
13
+------------
M
cc1/arch/z80/arch.c
 | 
26
+++++++++++++-------------
M
cc1/arch/z80/arch.h
 | 
13
+------------

6 files changed, 42 insertions(+), 75 deletions(-)
diff --git a/cc1/arch/amd64-sysv/arch.c b/cc1/arch/amd64-sysv/arch.c
@@ -40,7 +40,7 @@ static Type types[] = {
 	},
 	{       /* 3 = schartype */
 		.op = INT,
-		.letter = L_SCHAR,
+		.letter = L_INT8,
 		.defined = 1,
 		.size = 1,
 		.integer = 1,
@@ -52,7 +52,7 @@ static Type types[] = {
 	},
 	{      /* 4 = uchartype */
 		.op = INT,
-		.letter = L_UCHAR,
+		.letter = L_UINT8,
 		.defined = 1,
 		.size = 1,
 		.integer = 1,
@@ -63,7 +63,7 @@ static Type types[] = {
 	},
 	{      /* 5 = chartype */
 		.op = INT,
-		.letter = L_CHAR,
+		.letter = L_INT8,
 		.defined = 1,
 		.size = 1,
 		.integer = 1,
@@ -75,7 +75,7 @@ static Type types[] = {
 	},
 	{       /* 6 = ushortype */
 		.op = INT,
-		.letter = L_USHORT,
+		.letter = L_UINT16,
 		.defined = 1,
 		.size = 2,
 		.integer = 1,
@@ -86,7 +86,7 @@ static Type types[] = {
 	},
 	{       /* 7 = shortype */
 		.op = INT,
-		.letter = L_SHORT,
+		.letter = L_INT16,
 		.defined = 1,
 		.size = 2,
 		.integer = 1,
@@ -98,7 +98,7 @@ static Type types[] = {
 	},
 	{       /* 8 = uinttype */
 		.op = INT,
-		.letter = L_UINT,
+		.letter = L_UINT32,
 		.defined = 1,
 		.size = 4,
 		.integer = 1,
@@ -109,7 +109,7 @@ static Type types[] = {
 	},
 	{       /* 9 = inttype */
 		.op = INT,
-		.letter = L_INT,
+		.letter = L_INT32,
 		.defined = 1,
 		.size = 4,
 		.integer = 1,
@@ -121,7 +121,7 @@ static Type types[] = {
 	},
 	{      /* 10 = longtype */
 		.op = INT,
-		.letter = L_LONG,
+		.letter = L_INT64,
 		.defined = 1,
 		.size = 8,
 		.integer = 1,
@@ -133,7 +133,7 @@ static Type types[] = {
 	},
 	{       /* 11 = ulongtype */
 		.op = INT,
-		.letter = L_ULONG,
+		.letter = L_UINT64,
 		.defined = 1,
 		.size = 8,
 		.integer = 1,
@@ -144,7 +144,7 @@ static Type types[] = {
 	},
 	{	/* 12 = ullongtype */
 		.op = INT,
-		.letter = L_ULLONG,
+		.letter = L_UINT64,
 		.defined = 1,
 		.size = 8,
 		.integer = 1,
@@ -155,7 +155,7 @@ static Type types[] = {
 	},
 	{       /* 13 = llongtype */
 		.op = INT,
-		.letter = L_LLONG,
+		.letter = L_INT64,
 		.defined = 1,
 		.size = 8,
 		.integer = 1,
@@ -197,7 +197,7 @@ static Type types[] = {
 	},
 	{       /* 17 = sizettype */
 		.op = INT,
-		.letter = L_UINT,
+		.letter = L_UINT32,
 		.defined = 1,
 		.size = 8,
 		.integer = 1,
@@ -214,7 +214,7 @@ static Type types[] = {
 	},
 	{      /* 19 = pdifftype */
 		.op = INT,
-		.letter = L_LONG,
+		.letter = L_INT64,
 		.defined = 1,
 		.size = 8,
 		.integer = 1,
diff --git a/cc1/arch/amd64-sysv/arch.h b/cc1/arch/amd64-sysv/arch.h
@@ -20,15 +20,4 @@
 #define TFLOAT      double
 #define TSIZE       unsigned long
 
-#define L_SCHAR     L_INT8
-#define L_UCHAR     L_UINT8
-#define L_CHAR      L_INT8
-#define L_SHORT     L_INT16
-#define L_USHORT    L_UINT16
-#define L_INT       L_INT32
-#define L_UINT      L_UINT32
-#define L_LONG      L_INT64
-#define L_ULONG     L_UINT64
-#define L_LLONG     L_INT64
-#define L_ULLONG    L_UINT64
-#define L_ENUM      L_INT
+#define L_ENUM      L_INT32
diff --git a/cc1/arch/i386-sysv/arch.c b/cc1/arch/i386-sysv/arch.c
@@ -40,7 +40,7 @@ static Type types[] = {
 	},
 	{       /* 3 = schartype */
 		.op = INT,
-		.letter = L_SCHAR,
+		.letter = L_INT8,
 		.defined = 1,
 		.size = 1,
 		.integer = 1,
@@ -52,7 +52,7 @@ static Type types[] = {
 	},
 	{      /* 4 = uchartype */
 		.op = INT,
-		.letter = L_UCHAR,
+		.letter = L_UINT8,
 		.defined = 1,
 		.size = 1,
 		.integer = 1,
@@ -63,7 +63,7 @@ static Type types[] = {
 	},
 	{      /* 5 = chartype */
 		.op = INT,
-		.letter = L_CHAR,
+		.letter = L_INT8,
 		.defined = 1,
 		.size = 1,
 		.integer = 1,
@@ -75,7 +75,7 @@ static Type types[] = {
 	},
 	{       /* 6 = ushortype */
 		.op = INT,
-		.letter = L_USHORT,
+		.letter = L_UINT16,
 		.defined = 1,
 		.size = 2,
 		.integer = 1,
@@ -86,7 +86,7 @@ static Type types[] = {
 	},
 	{       /* 7 = shortype */
 		.op = INT,
-		.letter = L_SHORT,
+		.letter = L_INT16,
 		.defined = 1,
 		.size = 2,
 		.integer = 1,
@@ -98,7 +98,7 @@ static Type types[] = {
 	},
 	{       /* 8 = uinttype */
 		.op = INT,
-		.letter = L_UINT,
+		.letter = L_UINT32,
 		.defined = 1,
 		.size = 4,
 		.integer = 1,
@@ -109,7 +109,7 @@ static Type types[] = {
 	},
 	{       /* 9 = inttype */
 		.op = INT,
-		.letter = L_INT,
+		.letter = L_INT32,
 		.defined = 1,
 		.size = 4,
 		.integer = 1,
@@ -121,7 +121,7 @@ static Type types[] = {
 	},
 	{      /* 10 = longtype */
 		.op = INT,
-		.letter = L_LONG,
+		.letter = L_INT32,
 		.defined = 1,
 		.size = 4,
 		.integer = 1,
@@ -133,7 +133,7 @@ static Type types[] = {
 	},
 	{       /* 11 = ulongtype */
 		.op = INT,
-		.letter = L_ULONG,
+		.letter = L_UINT32,
 		.defined = 1,
 		.size = 4,
 		.integer = 1,
@@ -144,7 +144,7 @@ static Type types[] = {
 	},
 	{	/* 12 = ullongtype */
 		.op = INT,
-		.letter = L_ULLONG,
+		.letter = L_UINT64,
 		.defined = 1,
 		.size = 8,
 		.integer = 1,
@@ -155,7 +155,7 @@ static Type types[] = {
 	},
 	{       /* 13 = llongtype */
 		.op = INT,
-		.letter = L_LLONG,
+		.letter = L_INT64,
 		.defined = 1,
 		.size = 8,
 		.integer = 1,
@@ -197,7 +197,7 @@ static Type types[] = {
 	},
 	{       /* 17 = sizettype */
 		.op = INT,
-		.letter = L_UINT,
+		.letter = L_UINT32,
 		.defined = 1,
 		.size = 4,
 		.integer = 1,
@@ -214,7 +214,7 @@ static Type types[] = {
 	},
 	{       /* 19 = pdifftype */
 		.op = INT,
-		.letter = L_INT,
+		.letter = L_INT32,
 		.defined = 1,
 		.size = 4,
 		.integer = 1,
diff --git a/cc1/arch/i386-sysv/arch.h b/cc1/arch/i386-sysv/arch.h
@@ -20,15 +20,4 @@
 #define TFLOAT      double
 #define TSIZE       unsigned long
 
-#define L_SCHAR     L_INT8
-#define L_UCHAR     L_UINT8
-#define L_CHAR      L_INT8
-#define L_SHORT     L_INT16
-#define L_USHORT    L_UINT16
-#define L_INT       L_INT32
-#define L_UINT      L_UINT32
-#define L_LONG      L_INT32
-#define L_ULONG     L_UINT32
-#define L_LLONG     L_INT64
-#define L_ULLONG    L_UINT64
-#define L_ENUM      L_INT
+#define L_ENUM      L_INT32
diff --git a/cc1/arch/z80/arch.c b/cc1/arch/z80/arch.c
@@ -40,7 +40,7 @@ static Type types[] = {
 	},
 	{       /* 3 = schartype */
 		.op = INT,
-		.letter = L_SCHAR,
+		.letter = L_INT8,
 		.defined = 1,
 		.size = 1,
 		.integer = 1,
@@ -52,7 +52,7 @@ static Type types[] = {
 	},
 	{      /* 4 = uchartype */
 		.op = INT,
-		.letter = L_UCHAR,
+		.letter = L_UINT8,
 		.defined = 1,
 		.size = 1,
 		.integer = 1,
@@ -63,7 +63,7 @@ static Type types[] = {
 	},
 	{      /* 5 = chartype */
 		.op = INT,
-		.letter = L_CHAR,
+		.letter = L_UINT8,
 		.defined = 1,
 		.size = 1,
 		.integer = 1,
@@ -75,7 +75,7 @@ static Type types[] = {
 	},
 	{       /* 6 = ushortype */
 		.op = INT,
-		.letter = L_USHORT,
+		.letter = L_UINT16,
 		.defined = 1,
 		.size = 2,
 		.integer = 1,
@@ -86,7 +86,7 @@ static Type types[] = {
 	},
 	{       /* 7 = shortype */
 		.op = INT,
-		.letter = L_SHORT,
+		.letter = L_INT16,
 		.defined = 1,
 		.size = 2,
 		.integer = 1,
@@ -98,7 +98,7 @@ static Type types[] = {
 	},
 	{       /* 8 = uinttype */
 		.op = INT,
-		.letter = L_UINT,
+		.letter = L_UINT16,
 		.defined = 1,
 		.size = 2,
 		.integer = 1,
@@ -109,7 +109,7 @@ static Type types[] = {
 	},
 	{       /* 9 = inttype */
 		.op = INT,
-		.letter = L_INT,
+		.letter = L_INT16,
 		.defined = 1,
 		.size = 2,
 		.integer = 1,
@@ -121,7 +121,7 @@ static Type types[] = {
 	},
 	{      /* 10 = longtype */
 		.op = INT,
-		.letter = L_LONG,
+		.letter = L_INT32,
 		.defined = 1,
 		.size = 4,
 		.integer = 1,
@@ -133,7 +133,7 @@ static Type types[] = {
 	},
 	{       /* 11 = ulongtype */
 		.op = INT,
-		.letter = L_ULONG,
+		.letter = L_UINT32,
 		.defined = 1,
 		.size = 4,
 		.integer = 1,
@@ -144,7 +144,7 @@ static Type types[] = {
 	},
 	{	/* 12 = ullongtype */
 		.op = INT,
-		.letter = L_ULLONG,
+		.letter = L_UINT64,
 		.defined = 1,
 		.size = 8,
 		.integer = 1,
@@ -155,7 +155,7 @@ static Type types[] = {
 	},
 	{       /* 13 = llongtype */
 		.op = INT,
-		.letter = L_LLONG,
+		.letter = L_INT64,
 		.defined = 1,
 		.size = 8,
 		.integer = 1,
@@ -197,7 +197,7 @@ static Type types[] = {
 	},
 	{       /* 17 = sizettype */
 		.op = INT,
-		.letter = L_UINT,
+		.letter = L_UINT16,
 		.defined = 1,
 		.size = 2,
 		.integer = 1,
@@ -214,7 +214,7 @@ static Type types[] = {
 	},
 	{       /* 7 = pdifftype */
 		.op = INT,
-		.letter = L_SHORT,
+		.letter = L_INT16,
 		.defined = 1,
 		.size = 2,
 		.integer = 1,
diff --git a/cc1/arch/z80/arch.h b/cc1/arch/z80/arch.h
@@ -20,15 +20,4 @@
 #define TFLOAT      double
 #define TSIZE       unsigned short
 
-#define L_SCHAR     L_INT8
-#define L_UCHAR     L_UINT8
-#define L_CHAR      L_UINT8
-#define L_SHORT     L_INT16
-#define L_USHORT    L_UINT16
-#define L_INT       L_INT16
-#define L_UINT      L_UINT16
-#define L_LONG      L_INT32
-#define L_ULONG     L_UINT32
-#define L_LLONG     L_INT64
-#define L_ULLONG    L_UINT64
-#define L_ENUM      L_INT
+#define L_ENUM      L_INT16