diff options
| author | Kito Cheng <kito.cheng@sifive.com> | 2025-01-17 09:53:01 +0800 |
|---|---|---|
| committer | Nelson Chu <nelson@rivosinc.com> | 2025-01-17 12:34:50 +0800 |
| commit | 1c618df71307a9b1403c55ade463bf23e1d7e770 (patch) | |
| tree | e6f0dbacc5db332466af0f5fbf2996e04667a9fb | |
| parent | b4681c2e8a46af1559990398bbc8f010d26312ca (diff) | |
| download | gdb-1c618df71307a9b1403c55ade463bf23e1d7e770.zip gdb-1c618df71307a9b1403c55ade463bf23e1d7e770.tar.gz gdb-1c618df71307a9b1403c55ade463bf23e1d7e770.tar.bz2 | |
RISC-V: Use t2 for tail if Zicfilp enabled
This change is to make tail conform with software guarded jump of Zicfilp. The
reason to not choose t1 as the label register is that t1 is also as .got.plt
offset of _dl_runtime_resolve in PLT.
See more: https://github.com/riscv-non-isa/riscv-asm-manual/pull/93
| -rw-r--r-- | gas/testsuite/gas/riscv/tail.d | 13 | ||||
| -rw-r--r-- | gas/testsuite/gas/riscv/tail.s | 9 | ||||
| -rw-r--r-- | opcodes/riscv-opc.c | 1 |
3 files changed, 23 insertions, 0 deletions
diff --git a/gas/testsuite/gas/riscv/tail.d b/gas/testsuite/gas/riscv/tail.d new file mode 100644 index 0000000..6e5db23 --- /dev/null +++ b/gas/testsuite/gas/riscv/tail.d @@ -0,0 +1,13 @@ +#as: -march=rv32gc_zicfiss_zicfilp +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <foo>: +[ ]+[0-9a-f]+:[ ]+00000317[ ]+auipc[ ]+t1,0x0 +[ ]+[0-9a-f]+:[ ]+00030067[ ]+jr[ ]+t1 # 0 <foo> +[ ]+[0-9a-f]+:[ ]+00000397[ ]+auipc[ ]+t2,0x0 +[ ]+[0-9a-f]+:[ ]+00038067[ ]+jr[ ]+t2 # 8 <foo\+0x8> diff --git a/gas/testsuite/gas/riscv/tail.s b/gas/testsuite/gas/riscv/tail.s new file mode 100644 index 0000000..8058244 --- /dev/null +++ b/gas/testsuite/gas/riscv/tail.s @@ -0,0 +1,9 @@ +foo: +.option push +.option arch, rv32i + tail foo +.option pop +.option push +.option arch, rv32i_zicfilp + tail foo +.option pop diff --git a/opcodes/riscv-opc.c b/opcodes/riscv-opc.c index ed37eb7..ceb94a5 100644 --- a/opcodes/riscv-opc.c +++ b/opcodes/riscv-opc.c @@ -465,6 +465,7 @@ const struct riscv_opcode riscv_opcodes[] = {"jal", 0, INSN_CLASS_I, "d,a", MATCH_JAL, MASK_JAL, match_opcode, INSN_JSR }, {"call", 0, INSN_CLASS_I, "d,c", (X_T1 << OP_SH_RS1), (int) M_CALL, NULL, INSN_MACRO }, {"call", 0, INSN_CLASS_I, "c", (X_RA << OP_SH_RS1)|(X_RA << OP_SH_RD), (int) M_CALL, NULL, INSN_MACRO }, +{"tail", 0, INSN_CLASS_ZICFILP, "c", (X_T2 << OP_SH_RS1), (int) M_CALL, NULL, INSN_MACRO }, {"tail", 0, INSN_CLASS_I, "c", (X_T1 << OP_SH_RS1), (int) M_CALL, NULL, INSN_MACRO }, {"jump", 0, INSN_CLASS_I, "c,s", 0, (int) M_CALL, match_rs1_nonzero, INSN_MACRO }, {"nop", 0, INSN_CLASS_C, "", MATCH_C_ADDI, 0xffff, match_opcode, INSN_ALIAS }, |