diff options
| author | Richard Sandiford <richard.sandiford@arm.com> | 2022-09-30 12:34:59 +0100 |
|---|---|---|
| committer | Richard Sandiford <richard.sandiford@arm.com> | 2022-10-17 10:18:33 +0100 |
| commit | 13c0b769e826bc98492714193b5e7b222878bb82 (patch) | |
| tree | 488bcfdd66634feea4a74c88ec4286f25f2a88c3 /opcodes | |
| parent | 308aa8e21e1b713931651912792f075d81a75331 (diff) | |
| download | gdb-13c0b769e826bc98492714193b5e7b222878bb82.zip gdb-13c0b769e826bc98492714193b5e7b222878bb82.tar.gz gdb-13c0b769e826bc98492714193b5e7b222878bb82.tar.bz2 | |
aarch64: Tweak handling of F_STRICT
Current F_STRICT qualifier checking is enforced after the fact
rather than as part of the match. This makes it impossible to
have, e.g.:
QLF2(S_D, S_D)
QLF2(S_D, NIL)
in the same list.
opcodes/
* aarch64-opc.c (aarch64_find_best_match): Handle F_STRICT here
rather than...
(match_operands_qualifier): ...here.
Diffstat (limited to 'opcodes')
| -rw-r--r-- | opcodes/aarch64-opc.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/opcodes/aarch64-opc.c b/opcodes/aarch64-opc.c index 1d4668a..a2882bd 100644 --- a/opcodes/aarch64-opc.c +++ b/opcodes/aarch64-opc.c @@ -958,19 +958,19 @@ aarch64_find_best_match (const aarch64_inst *inst, dump_match_qualifiers (inst->operands, qualifiers); #endif - /* Most opcodes has much fewer patterns in the list. - First NIL qualifier indicates the end in the list. */ - if (empty_qualifier_sequence_p (qualifiers)) + /* The first entry should be taken literally, even if it's an empty + qualifier sequence. (This matters for strict testing.) In other + positions an empty sequence acts as a terminator. */ + if (i > 0 && empty_qualifier_sequence_p (qualifiers)) { - DEBUG_TRACE_IF (i == 0, "SUCCEED: empty qualifier list"); - if (i) - found = 0; + found = 0; break; } for (j = 0; j < num_opnds && j <= stop_at; ++j, ++qualifiers) { - if (inst->operands[j].qualifier == AARCH64_OPND_QLF_NIL) + if (inst->operands[j].qualifier == AARCH64_OPND_QLF_NIL + && !(inst->opcode->flags & F_STRICT)) { /* Either the operand does not have qualifier, or the qualifier for the operand needs to be deduced from the qualifier @@ -1038,7 +1038,7 @@ aarch64_find_best_match (const aarch64_inst *inst, static int match_operands_qualifier (aarch64_inst *inst, bool update_p) { - int i, nops; + int i; aarch64_opnd_qualifier_seq_t qualifiers; if (!aarch64_find_best_match (inst, inst->opcode->qualifiers_list, -1, @@ -1048,15 +1048,6 @@ match_operands_qualifier (aarch64_inst *inst, bool update_p) return 0; } - if (inst->opcode->flags & F_STRICT) - { - /* Require an exact qualifier match, even for NIL qualifiers. */ - nops = aarch64_num_of_operands (inst->opcode); - for (i = 0; i < nops; ++i) - if (inst->operands[i].qualifier != qualifiers[i]) - return false; - } - /* Update the qualifiers. */ if (update_p) for (i = 0; i < AARCH64_MAX_OPND_NUM; ++i) |