aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2023-05-23 09:01:31 +0200
committerJan Beulich <jbeulich@suse.com>2023-05-23 09:01:31 +0200
commita4f8c177b46fe96b08a066c159a7a11071095a30 (patch)
tree0c7954062271b89f2ff242ea118e98dca955c592
parent6acf9130909e5f531bb742939d402b40dee08304 (diff)
downloadgdb-a4f8c177b46fe96b08a066c159a7a11071095a30.zip
gdb-a4f8c177b46fe96b08a066c159a7a11071095a30.tar.gz
gdb-a4f8c177b46fe96b08a066c159a7a11071095a30.tar.bz2
x86/Intel: address quoted-symbol related FIXMEs
If in a "word ptr <address>" or alike construct the "ptr" part is double-quoted, it shouldn't be recognized as the specific keyword we're looking for (just like we don't recognize double-quoted operator or register names anymore). Be careful though to tell closing from opening double-quotes, as a quoted symbol may follow right afterwards.
-rw-r--r--gas/config/tc-i386-intel.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/gas/config/tc-i386-intel.c b/gas/config/tc-i386-intel.c
index b5c97be..fa32226 100644
--- a/gas/config/tc-i386-intel.c
+++ b/gas/config/tc-i386-intel.c
@@ -188,15 +188,12 @@ operatorT i386_operator (const char *name, unsigned int operands, char *pc)
if (i386_types[j].name && *pc == ' ')
{
+ const char *start = ++input_line_pointer;
char *pname;
- char c;
+ char c = get_symbol_name (&pname);
- ++input_line_pointer;
- c = get_symbol_name (&pname);
-
- if (strcasecmp (pname, "ptr") == 0)
+ if (strcasecmp (pname, "ptr") == 0 && (c != '"' || pname == start))
{
- /* FIXME: What if c == '"' ? */
pname[-1] = *pc;
*pc = c;
if (intel_syntax > 0 || operands != 1)
@@ -204,9 +201,8 @@ operatorT i386_operator (const char *name, unsigned int operands, char *pc)
return i386_types[j].op;
}
- if (strcasecmp (pname, "bcst") == 0)
+ if (strcasecmp (pname, "bcst") == 0 && (c != '"' || pname == start))
{
- /* FIXME: Again, what if c == '"' ? */
pname[-1] = *pc;
*pc = c;
if (intel_syntax > 0 || operands != 1