Changeset 616

Timestamp:

Aug 16, 2003, 9:45:29 PM (22 years ago)

Author:

zap

Message:

A slightly better solution for attribute comparison function.

File:

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

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

@@ -1268 +1268 @@
 
 
-/* Table of valid machine attributes.  */
+/* Table of valid machine attributes. If you change it, you must change the array at
+   the beginning of ix86_comp_type_attributes() as well! */
 const struct attribute_spec ix86_attribute_table[] =
 {
@@ -1303 +1304 @@
   unsigned i;
   const char *exclname;
-  static const char *cc [] =
-  {
-    "cdecl",
-    "stdcall",
-    "regparm",
-#ifdef TARGET_SYSTEM_DECL_ATTRIBUTES
-    "system",
-#endif
-#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES
-    "optlink",
-#endif
-  };
 
   exclname = IDENTIFIER_POINTER (name);
@@ -1334 +1323 @@
     }
 
-  for (i = 0; i < sizeof (cc) / sizeof (const char *); i++)
-    if (lookup_attribute (cc [i], TYPE_ATTRIBUTES (type)))
+  for (i = 0; ix86_attribute_table [i].name; i++)
+    if (lookup_attribute (ix86_attribute_table [i].name, TYPE_ATTRIBUTES (type)))
       {
         /* Warn if we have another calling convention attribute and it is
@@ -1341 +1330 @@
            already an attribute with the same name attached, silently ignore
            currently processed attribute. */
-        if (strcmp (exclname, cc [i]))
+        if (strcmp (exclname, ix86_attribute_table [i].name))
           warning ("`%s' attribute is incompatible with earlier defined `%s' attribute",
-                   IDENTIFIER_POINTER (name), cc [i]);
+                   IDENTIFIER_POINTER (name), ix86_attribute_table [i].name);
         *no_add_attrs = true;
         return -1;
@@ -1539 +1528 @@
   unsigned i;
   unsigned char cc1 = 0, cc2 = 0;
-  static struct
+  /* WARNING! Keep in sync with ix86_attribute_table!!! */
+  unsigned char attrcode [] =
   {
-    const char *attr;
-    unsigned char flag;
-  } typecode [] =
-  {
-    { "cdecl",   0x10 },
-    { "stdcall", 0x20 },
-    { "regparm", 0x30 },
+    0x10, // stdcall
+    0x20, // cdecl
+    0x30, // regparm
+#ifdef TARGET_DLLIMPORT_DECL_ATTRIBUTES
+    0x40, // dllimport
+    0x50, // dllexport
+    0x60, // shared
+#endif
 #ifdef TARGET_SYSTEM_DECL_ATTRIBUTES
-    { "system",  0x11 },
+    0x21, // system is compatible with cdecl
 #endif
 #ifdef TARGET_OPTLINK_DECL_ATTRIBUTES
-    { "optlink", 0x40 },
+    0x70, // optlink
 #endif
   };
@@ -1568 +1559 @@
    */
 
-  for (i = 0; i < sizeof (typecode) / sizeof (typecode [0]); i++)
-    {
-      if (lookup_attribute (typecode [i].attr, TYPE_ATTRIBUTES (type1)))
-        cc1 = typecode [i].flag;
-      if (lookup_attribute (typecode [i].attr, TYPE_ATTRIBUTES (type2)))
-        cc2 = typecode [i].flag;
+  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 (!cc1)
-    cc1 = TARGET_RTD ? 0x20 : 0x10;
+    cc1 = TARGET_RTD ? 0x10 : 0x20;
   if (!cc2)
-    cc2 = TARGET_RTD ? 0x20 : 0x10;
+    cc2 = TARGET_RTD ? 0x10 : 0x20;
 
   /* If calling conventions are the same, its okay */
@@ -1589 +1580 @@
     return 0;
 
-  /* They are nearly compatible, issue a warning */
+  /* They are nearly compatible */
   return 2;
 }