aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog6
-rw-r--r--gas/config/tc-tic54x.c25
-rw-r--r--gas/config/tc-tic54x.h3
3 files changed, 11 insertions, 23 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index d47f020..57a9b94 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-10 Jan Beulich <jbeulich@novell.com>
+
+ * config/tc-tic54x.h (tic54x_macro_info): Change parameter type.
+ * config/tc-tic54x.c (tic54x_macro_info): Likewise. Replace hand-
+ crafted structure declarations with the types from macro.h.
+
2005-03-09 Richard Sandiford <rsandifo@redhat.com>
* config/tc-mips.c (s_cpsetup): Use '__gnu_local_gp' instead of '_gp'
diff --git a/gas/config/tc-tic54x.c b/gas/config/tc-tic54x.c
index 5ff3fdd..e08a4df 100644
--- a/gas/config/tc-tic54x.c
+++ b/gas/config/tc-tic54x.c
@@ -2700,29 +2700,10 @@ tic54x_macro_start ()
}
void
-tic54x_macro_info (info)
- void *info;
+tic54x_macro_info (macro)
+ const macro_entry *macro;
{
- struct formal_struct
- {
- struct formal_struct *next; /* Next formal in list */
- sb name; /* Name of the formal */
- sb def; /* The default value */
- sb actual; /* The actual argument (changed on
- each expansion) */
- int index; /* The index of the formal
- 0 .. formal_count - 1 */
- } *entry;
- struct macro_struct
- {
- sb sub; /* Substitution text. */
- int formal_count; /* Number of formal args. */
- struct formal_struct *formals; /* Pointer to list of
- formal_structs. */
- struct hash_control *formal_hash; /* Hash table of formals. */
- } *macro;
-
- macro = (struct macro_struct *) info;
+ const formal_entry *entry;
/* Put the formal args into the substitution symbol table. */
for (entry = macro->formals; entry; entry = entry->next)
diff --git a/gas/config/tc-tic54x.h b/gas/config/tc-tic54x.h
index 07b1f67..5d36fdc 100644
--- a/gas/config/tc-tic54x.h
+++ b/gas/config/tc-tic54x.h
@@ -97,7 +97,8 @@ extern void tic54x_macro_start (void);
#define md_macro_end() tic54x_macro_end()
extern void tic54x_macro_end (void);
#define md_macro_info(args) tic54x_macro_info(args)
-extern void tic54x_macro_info PARAMS((void *macro));
+struct macro_struct;
+extern void tic54x_macro_info PARAMS((const struct macro_struct *));
#define tc_frob_label(sym) tic54x_define_label (sym)
extern void tic54x_define_label PARAMS((symbolS *));