diff options
| author | Jan Beulich <jbeulich@suse.com> | 2023-03-17 10:05:05 +0100 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2023-03-17 10:05:05 +0100 |
| commit | 3da593e8de13861b637c50dc9c291a229bac6b2f (patch) | |
| tree | 98ee6f3ca4e3f99f4d488a6be96ef25617da3a88 /gas/macro.c | |
| parent | 14317f7f05d0290586f456d02176dd77a81aee69 (diff) | |
| download | gdb-3da593e8de13861b637c50dc9c291a229bac6b2f.zip gdb-3da593e8de13861b637c50dc9c291a229bac6b2f.tar.gz gdb-3da593e8de13861b637c50dc9c291a229bac6b2f.tar.bz2 | |
gas: drop function pointer parameter from macro_init()
With the removal of gasp (about 20 years ago) the need for this kind-
of-hook has disappeared. Go a step beyond merely moving the to be called
function: Inline its contents right at the sole call site.
Diffstat (limited to 'gas/macro.c')
| -rw-r--r-- | gas/macro.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/gas/macro.c b/gas/macro.c index fae94ae..fec806d 100644 --- a/gas/macro.c +++ b/gas/macro.c @@ -62,10 +62,6 @@ static int macro_mri; static int macro_strip_at; -/* Function to use to parse an expression. */ - -static size_t (*macro_expr) (const char *, size_t, sb *, offsetT *); - /* Number of macro expansions that have been done. */ static int macro_number; @@ -82,8 +78,7 @@ macro_del_f (void *ent) /* Initialize macro processing. */ void -macro_init (int alternate, int mri, int strip_at, - size_t (*exp) (const char *, size_t, sb *, offsetT *)) +macro_init (int alternate, int mri, int strip_at) { macro_hash = htab_create_alloc (16, hash_string_tuple, eq_string_tuple, macro_del_f, notes_calloc, NULL); @@ -91,7 +86,6 @@ macro_init (int alternate, int mri, int strip_at, macro_alternate = alternate; macro_mri = mri; macro_strip_at = strip_at; - macro_expr = exp; } void @@ -412,16 +406,21 @@ get_any_string (size_t idx, sb *in, sb *out) } else if (in->ptr[idx] == '%' && macro_alternate) { - offsetT val; + /* Turn the following expression into a string. */ + expressionS ex; char buf[64]; - /* Turns the next expression into a string. */ - /* xgettext: no-c-format */ - idx = (*macro_expr) (_("% operator needs absolute expression"), - idx + 1, - in, - &val); - sprintf (buf, "%" PRId64, (int64_t) val); + sb_terminate (in); + + temp_ilp (in->ptr + idx + 1); + expression_and_evaluate (&ex); + idx = input_line_pointer - in->ptr; + restore_ilp (); + + if (ex.X_op != O_constant) + as_bad (_("%% operator needs absolute expression")); + + sprintf (buf, "%" PRId64, (int64_t) ex.X_add_number); sb_add_string (out, buf); } else if (in->ptr[idx] == '"' |