From 97b29a61f7f001550fe985bf2deea1550e3c20dd Mon Sep 17 00:00:00 2001 From: Cupertino Miranda Date: Tue, 21 Nov 2023 12:26:08 +0000 Subject: [PATCH] bpf: Fixed register parsing disambiguating with possible symbol. This changes parse_bpf_register to detect possible symbols that start with valid register name, however due some following characters are not. Also changed the regs-for-symbols-pseudo.s, adding some entries that should not error if parser is properly detecting the symbol. --- gas/config/tc-bpf.c | 4 ++++ gas/testsuite/gas/bpf/regs-for-symbols-pseudoc.s | 3 +++ 2 files changed, 7 insertions(+) diff --git a/gas/config/tc-bpf.c b/gas/config/tc-bpf.c index 45abc3c9578..b6b1db47427 100644 --- a/gas/config/tc-bpf.c +++ b/gas/config/tc-bpf.c @@ -1300,6 +1300,10 @@ parse_bpf_register (char *s, char rw, uint8_t *regno) s += 1; } + /* If we are still parsing a name, it is not a register. */ + if (is_part_of_name (*s)) + return NULL; + return s; } diff --git a/gas/testsuite/gas/bpf/regs-for-symbols-pseudoc.s b/gas/testsuite/gas/bpf/regs-for-symbols-pseudoc.s index 693787d5479..9b75f275285 100644 --- a/gas/testsuite/gas/bpf/regs-for-symbols-pseudoc.s +++ b/gas/testsuite/gas/bpf/regs-for-symbols-pseudoc.s @@ -2,3 +2,6 @@ r2 = r3 ll r2 = r3+1 ll r2 = 1+r3 ll + r2 = r2d2 ll + r2 = r2d2+1 ll + r2 = 1+r2d2 ll -- 2.39.5