mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-27 03:51:15 +08:00
657edeab38
Commit 7992631e8c ("gas/Dwarf: improve debug info generation from .irp
and alike blocks"), while dealing okay with actual assembly source files
not using .file/.line and alike outside but not inside of .macro, has
undue effects when the logical file/line pair was already overridden:
Line numbers would continuously increment while processing the expanded
macro, while the goal of the PR gas/16908 workaround is to keep the
expansion associated with the line invoking the macro. However, as soon
as enough state was overridden _inside_ the macro to cause as_where() to
no longer fall back top as_where_physical(), honor this by resuming the
bumping of the logical line number.
Note that from_sb_is_expansion's initializer was 1 for an unknown
reason. While renaming the variable and changing its type, also change
the initializer to "expanding_none", which would have been "0" in the
original code. Originally the initializer value itself wasn't ever used
anyway (requiring sb_index != -1), as it necessarily had changed in
input_scrub_include_sb() alongside setting sb_index to other than -1.
Strictly speaking input_scrub_insert_line() perhaps shouldn't use
expanding_none, yet none of the other enumerators fit there either. And
then strictly speaking that function probably shouldn't exist in the
first place. It's used only by tic54x.
78 lines
2.7 KiB
C
78 lines
2.7 KiB
C
/* sb.h - header file for string buffer manipulation routines
|
|
Copyright (C) 1994-2022 Free Software Foundation, Inc.
|
|
|
|
Written by Steve and Judy Chamberlain of Cygnus Support,
|
|
sac@cygnus.com
|
|
|
|
This file is part of GAS, the GNU Assembler.
|
|
|
|
GAS is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3, or (at your option)
|
|
any later version.
|
|
|
|
GAS is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GAS; see the file COPYING. If not, write to the Free
|
|
Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
|
|
02110-1301, USA. */
|
|
|
|
#ifndef SB_H
|
|
|
|
#define SB_H
|
|
|
|
/* String blocks
|
|
|
|
I had a couple of choices when deciding upon this data structure.
|
|
gas uses null terminated strings for all its internal work. This
|
|
often means that parts of the program that want to examine
|
|
substrings have to manipulate the data in the string to do the
|
|
right thing (a common operation is to single out a bit of text by
|
|
saving away the character after it, nulling it out, operating on
|
|
the substring and then replacing the character which was under the
|
|
null). This is a pain and I remember a load of problems that I had with
|
|
code in gas which almost got this right. Also, it's harder to grow and
|
|
allocate null terminated strings efficiently.
|
|
|
|
Obstacks provide all the functionality needed, but are too
|
|
complicated, hence the sb.
|
|
|
|
An sb is allocated by the caller. */
|
|
|
|
typedef struct sb
|
|
{
|
|
char *ptr; /* Points to the current block. */
|
|
size_t len; /* How much is used. */
|
|
size_t max; /* The maximum length. */
|
|
}
|
|
sb;
|
|
|
|
extern void sb_new (sb *);
|
|
extern void sb_build (sb *, size_t);
|
|
extern void sb_kill (sb *);
|
|
extern void sb_add_sb (sb *, sb *);
|
|
extern void sb_scrub_and_add_sb (sb *, sb *);
|
|
extern void sb_reset (sb *);
|
|
extern void sb_add_char (sb *, size_t);
|
|
extern void sb_add_string (sb *, const char *);
|
|
extern void sb_add_buffer (sb *, const char *, size_t);
|
|
extern char *sb_terminate (sb *);
|
|
extern size_t sb_skip_white (size_t, sb *);
|
|
extern size_t sb_skip_comma (size_t, sb *);
|
|
|
|
/* Actually in input-scrub.c. */
|
|
enum expansion {
|
|
/* Note: Order matters! */
|
|
expanding_none,
|
|
expanding_repeat,
|
|
expanding_macro,
|
|
expanding_nested, /* Only for internal use of input-scrub.c. */
|
|
};
|
|
extern void input_scrub_include_sb (sb *, char *, enum expansion);
|
|
|
|
#endif /* SB_H */
|