From 7c06efaa6494dcdb65e8f2bd712041b9d18fd74d Mon Sep 17 00:00:00 2001 From: Jim Wilson Date: Thu, 26 May 2005 18:46:12 +0000 Subject: [PATCH] Fix issues noticed while reviewing Jan Beulich's MLX template bug fix. * config/tc-ia64.c (extra_goodness): Update comment. (md_begin): Add debugging code to print best_template table. --- gas/ChangeLog | 5 +++++ gas/config/tc-ia64.c | 20 ++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 751a0d03909..546792e8fb6 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2005-05-26 James E Wilson + + * config/tc-ia64.c (extra_goodness): Update comment. + (md_begin): Add debugging code to print best_template table. + 2005-05-25 Jan Beulich * config/tc-ia64.c (md_begin): Don't try to match slot 2 of an MLX diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c index 4f2e462a8aa..25223a1f730 100644 --- a/gas/config/tc-ia64.c +++ b/gas/config/tc-ia64.c @@ -7141,8 +7141,9 @@ match (int templ, int type, int slot) return result; } -/* Add a bit of extra goodness if a nop of type F or B would fit - in TEMPL at SLOT. */ +/* For Itanium 1, add a bit of extra goodness if a nop of type F or B would fit + in TEMPL at SLOT. For Itanium 2, add a bit of extra goodness if a nop of + type M or I would fit in TEMPL at SLOT. */ static inline int extra_goodness (int templ, int slot) @@ -7320,6 +7321,21 @@ md_begin () } } +#ifdef DEBUG_TEMPLATES + /* For debugging changes to the best_template calculations. We don't care + about combinations with invalid instructions, so start the loops at 1. */ + for (i = 0; i < IA64_NUM_TYPES; ++i) + for (j = 0; j < IA64_NUM_TYPES; ++j) + for (k = 0; k < IA64_NUM_TYPES; ++k) + { + char type_letter[IA64_NUM_TYPES] = { 'n', 'a', 'i', 'm', 'b', 'f', + 'x', 'd' }; + fprintf (stderr, "%c%c%c %s\n", type_letter[i], type_letter[j], + type_letter[k], + ia64_templ_desc[best_template[i][j][k]].name); + } +#endif + for (i = 0; i < NUM_SLOTS; ++i) md.slot[i].user_template = -1; -- 2.30.2