This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Avoid explicit use of machine modes (6/n) objc/objc-act.c
- From: "Zack Weinberg" <zack at codesourcery dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Mon, 29 Sep 2003 15:24:50 -0700
- Subject: Avoid explicit use of machine modes (6/n) objc/objc-act.c
objc-act.c uses mode numbers to determine the encoding of type
strings. I looked into matching what cp/mangle.c does when faced with
a similar problem (it uses itk_* numbers) but I did not think I could
guarantee no ABI changes if I did that. So I just made the codes
depend on the mode bitsizes instead of the modes directly.
zw
* objc/objc-act.c (encode_type): Encode INTEGER_TYPEs and
REAL_TYPEs based on the bitsize of the type's mode, not the
mode directly.
===================================================================
Index: objc/objc-act.c
--- objc/objc-act.c 26 Sep 2003 22:45:29 -0000 1.196
+++ objc/objc-act.c 29 Sep 2003 22:25:03 -0000
@@ -7325,62 +7325,42 @@ encode_next_bitfield (int width)
}
/* FORMAT will be OBJC_ENCODE_INLINE_DEFS or OBJC_ENCODE_DONT_INLINE_DEFS. */
-
static void
encode_type (tree type, int curtype, int format)
{
enum tree_code code = TREE_CODE (type);
+ char c;
if (code == INTEGER_TYPE)
{
- if (integer_zerop (TYPE_MIN_VALUE (type)))
+ switch (GET_MODE_BITSIZE (TYPE_MODE (type)))
{
- /* Unsigned integer types. */
-
- if (TYPE_MODE (type) == QImode)
- obstack_1grow (&util_obstack, 'C');
- else if (TYPE_MODE (type) == HImode)
- obstack_1grow (&util_obstack, 'S');
- else if (TYPE_MODE (type) == SImode)
- {
- if (type == long_unsigned_type_node)
- obstack_1grow (&util_obstack, 'L');
- else
- obstack_1grow (&util_obstack, 'I');
- }
- else if (TYPE_MODE (type) == DImode)
- obstack_1grow (&util_obstack, 'Q');
- }
-
- else
- /* Signed integer types. */
- {
- if (TYPE_MODE (type) == QImode)
- obstack_1grow (&util_obstack, 'c');
- else if (TYPE_MODE (type) == HImode)
- obstack_1grow (&util_obstack, 's');
- else if (TYPE_MODE (type) == SImode)
- {
- if (type == long_integer_type_node)
- obstack_1grow (&util_obstack, 'l');
- else
- obstack_1grow (&util_obstack, 'i');
- }
-
- else if (TYPE_MODE (type) == DImode)
- obstack_1grow (&util_obstack, 'q');
+ case 8: c = TREE_UNSIGNED (type) ? 'C' : 'c'; break;
+ case 16: c = TREE_UNSIGNED (type) ? 'S' : 's'; break;
+ case 32:
+ if (type == long_unsigned_type_node
+ || type == long_integer_type_node)
+ c = TREE_UNSIGNED (type) ? 'L' : 'l';
+ else
+ c = TREE_UNSIGNED (type) ? 'I' : 'i';
+ break;
+ case 64: c = TREE_UNSIGNED (type) ? 'Q' : 'q'; break;
+ default: abort ();
}
+ obstack_1grow (&util_obstack, c);
}
else if (code == REAL_TYPE)
{
/* Floating point types. */
-
- if (TYPE_MODE (type) == SFmode)
- obstack_1grow (&util_obstack, 'f');
- else if (TYPE_MODE (type) == DFmode
- || TYPE_MODE (type) == TFmode)
- obstack_1grow (&util_obstack, 'd');
+ switch (GET_MODE_BITSIZE (TYPE_MODE (type)))
+ {
+ case 32: c = 'f'; break;
+ case 64:
+ case 128: c = 'd'; break;
+ default: abort ();
+ }
+ obstack_1grow (&util_obstack, c);
}
else if (code == VOID_TYPE)