Changeset 617

Timestamp:

Aug 16, 2003, 10:07:31 PM (22 years ago)

Author:

zap

Message:

Attribute compatibility checking logic enhanced even more

File:

• trunk/src/gcc/gcc/config/i386/i386.c (modified) (5 diffs, 1 prop)

trunk/src/gcc/gcc/config/i386/i386.c

@@ -1297 +1297 @@
 };
 
+/* The attribute denotes a calling convention */
+#define IX86_ATTR_TYPE_CALLCONV  0x00010000
+/* Calling convention mask: attributes with bits
+   in these positions equal are nealy compatible */
+#define IX86_ATTR_MASK_CALLCONV  0x0000000f
+/* Ordinal number for attributes with equal calling convention bits */
+#define IX86_ATTR_MASK_ORDINAL   0x000000f0
+
+/* This array contains some flags containing additional information
+   about attributes. Keep it in sync with ix86_attribute_table. */
+static unsigned ix86_attribute_codes [] =
+{
+  IX86_ATTR_TYPE_CALLCONV | 0x01, /* stdcall */
+  IX86_ATTR_TYPE_CALLCONV | 0x02, /* cdecl */
+  IX86_ATTR_TYPE_CALLCONV | 0x03, /* regparm */
+#ifdef TARGET_DLLIMPORT_DECL_ATTRIBUTES
+  0, /* dllimport */
+  0, /* dllexport */
+  0, /* shared */
+#endif
+#ifdef TARGET_SYSTEM_DECL_ATTRIBUTES
+  IX86_ATTR_TYPE_CALLCONV | 0x12, /* system is compatible with cdecl */
+#endif
+#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES
+  IX86_ATTR_TYPE_CALLCONV | 0x04, /* optlink */
+#endif
+};
+
+
 /* Check if we don't have incompatible calling conversion attributes */
 int
@@ -1324 +1353 @@
 
   for (i = 0; ix86_attribute_table [i].name; i++)
-    if (lookup_attribute (ix86_attribute_table [i].name, TYPE_ATTRIBUTES (type)))
+    if ((ix86_attribute_codes [i] & IX86_ATTR_TYPE_CALLCONV)
+     && lookup_attribute (ix86_attribute_table [i].name, TYPE_ATTRIBUTES (type)))
       {
         /* Warn if we have another calling convention attribute and it is
@@ -1526 +1556 @@
      tree type2;
 {
-  unsigned i;
-  unsigned char cc1 = 0, cc2 = 0;
-  /* WARNING! Keep in sync with ix86_attribute_table!!! */
-  unsigned char attrcode [] =
-  {
-    0x10, // stdcall
-    0x20, // cdecl
-    0x30, // regparm
-#ifdef TARGET_DLLIMPORT_DECL_ATTRIBUTES
-    0x40, // dllimport
-    0x50, // dllexport
-    0x60, // shared
-#endif
-#ifdef TARGET_SYSTEM_DECL_ATTRIBUTES
-    0x21, // system is compatible with cdecl
-#endif
-#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES
-    0x70, // optlink
-#endif
-  };
+  unsigned i, cc1 = 0, cc2 = 0;
 
   /* The following calling conventions have meaning only for functions */
@@ -1560 +1571 @@
 
   for (i = 0; ix86_attribute_table [i].name; i++)
-    {
-      if (lookup_attribute (ix86_attribute_table [i].name, TYPE_ATTRIBUTES (type1)))
-        cc1 = attrcode [i];
-      if (lookup_attribute (ix86_attribute_table [i].name, TYPE_ATTRIBUTES (type2)))
-        cc2 = attrcode [i];
-    }
+    if (ix86_attribute_codes [i] & IX86_ATTR_TYPE_CALLCONV)
+      {
+        if (lookup_attribute (ix86_attribute_table [i].name, TYPE_ATTRIBUTES (type1)))
+          cc1 = ix86_attribute_codes [i];
+        if (lookup_attribute (ix86_attribute_table [i].name, TYPE_ATTRIBUTES (type2)))
+          cc2 = ix86_attribute_codes [i];
+      }
 
   if (!cc1)
-    cc1 = TARGET_RTD ? 0x10 : 0x20;
+    cc1 = ix86_attribute_codes [TARGET_RTD ? 0 : 1];
   if (!cc2)
-    cc2 = TARGET_RTD ? 0x10 : 0x20;
+    cc2 = ix86_attribute_codes [TARGET_RTD ? 0 : 1];
 
   /* If calling conventions are the same, its okay */
@@ -1577 +1589 @@
 
   /* If they are not compatible, return 0 */
-  if ((cc1 ^ cc2) & 0xf0)
+  if ((cc1 ^ cc2) & IX86_ATTR_MASK_CALLCONV)
     return 0;