From d2825c1a4c862b9adaa4be19ddb4b44fb209672e Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Wed, 10 Dec 2008 23:28:19 +0000 Subject: [PATCH] merge from gcc --- include/ChangeLog | 5 +++++ include/demangle.h | 13 +++++++++++++ libiberty/ChangeLog | 5 +++++ libiberty/cp-demangle.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+) diff --git a/include/ChangeLog b/include/ChangeLog index 79bebbf..73892f5 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2008-12-10 Jason Merrill + + * demangle.h (enum demangle_component_type): Add + DEMANGLE_COMPONENT_FIXED_TYPE. + 2008-12-01 Cary Coutant * plugin-api.h (ld_plugin_message): Change format parameter to const. diff --git a/include/demangle.h b/include/demangle.h index 0ea639d..28c69f5 100644 --- a/include/demangle.h +++ b/include/demangle.h @@ -319,6 +319,8 @@ enum demangle_component_type and the right subtree is the member type. CV-qualifiers appear on the latter. */ DEMANGLE_COMPONENT_PTRMEM_TYPE, + /* A fixed-point type. */ + DEMANGLE_COMPONENT_FIXED_TYPE, /* An argument list. The left subtree is the current argument, and the right subtree is either NULL or another ARGLIST node. */ DEMANGLE_COMPONENT_ARGLIST, @@ -419,6 +421,17 @@ struct demangle_component struct demangle_component *name; } s_extended_operator; + /* For DEMANGLE_COMPONENT_FIXED_TYPE. */ + struct + { + /* The length, indicated by a C integer type name. */ + struct demangle_component *length; + /* _Accum or _Fract? */ + short accum; + /* Saturating or not? */ + short sat; + } s_fixed; + /* For DEMANGLE_COMPONENT_CTOR. */ struct { diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index fd9d300..a6721bf 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2008-12-10 Jason Merrill + + * cp-demangle.c (cplus_demangle_type): Support fixed-point types. + (d_print_comp, d_dump): Likewise. + 2008-10-22 Daniel Jacobowitz * Makefile.in (CPPFLAGS): Define. diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index 3fa5f1f..de0d9f7 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -621,6 +621,9 @@ d_dump (struct demangle_component *dc, int indent) case DEMANGLE_COMPONENT_PTRMEM_TYPE: printf ("pointer to member type\n"); break; + case DEMANGLE_COMPONENT_FIXED_TYPE: + printf ("fixed-point type\n"); + break; case DEMANGLE_COMPONENT_ARGLIST: printf ("argument list\n"); break; @@ -2115,6 +2118,19 @@ cplus_demangle_type (struct d_info *di) ret = d_make_builtin_type (di, &cplus_demangle_builtin_types[31]); di->expansion += ret->u.s_builtin.type->len; break; + + case 'F': + /* Fixed point types. DF */ + ret = d_make_empty (di); + ret->type = DEMANGLE_COMPONENT_FIXED_TYPE; + if ((ret->u.s_fixed.accum = IS_DIGIT (d_peek_char (di)))) + /* For demangling we don't care about the bits. */ + d_number (di); + ret->u.s_fixed.length = cplus_demangle_type (di); + d_number (di); + peek = d_next_char (di); + ret->u.s_fixed.sat = (peek == 's'); + break; } break; @@ -3725,6 +3741,22 @@ d_print_comp (struct d_print_info *dpi, return; } + case DEMANGLE_COMPONENT_FIXED_TYPE: + if (dc->u.s_fixed.sat) + d_append_string (dpi, "_Sat "); + /* Don't print "int _Accum". */ + if (dc->u.s_fixed.length->u.s_builtin.type + != &cplus_demangle_builtin_types['i'-'a']) + { + d_print_comp (dpi, dc->u.s_fixed.length); + d_append_char (dpi, ' '); + } + if (dc->u.s_fixed.accum) + d_append_string (dpi, "_Accum"); + else + d_append_string (dpi, "_Fract"); + return; + case DEMANGLE_COMPONENT_ARGLIST: case DEMANGLE_COMPONENT_TEMPLATE_ARGLIST: if (d_left (dc) != NULL) -- 2.7.4