Skip to content

Commit 00b2425

Browse files
bjorn-rivospalmer-dabbelt
authored andcommitted
scripts/decodecode: Add support for RISC-V
RISC-V has some GNU disassembly quirks, e.g. it requires '-D' to properly disassemble .2byte directives similar to Arm [1]. Further, GNU objdump groups RISC-V instruction by 2 or 4 byte chunks, instead doing byte-for-byte. Add the required switches, and translate from short/word to bytes when ARCH is "riscv". An example how to invoke decodecode for RISC-V: $ echo 'Code: bf45 f793 1007 f7d9 50ef 37af d541 b7d9 7097 00c8 (80e7) 6140' | AFLAGS="-march=rv64imac_zicbom_zihintpause" \ ARCH=riscv CROSS_COMPILE=riscv64-linux-gnu- ./scripts/decodecode Code: bf45 f793 1007 f7d9 50ef 37af d541 b7d9 7097 00c8 (80e7) 6140 All code ======== 0: bf45 c.j 0xffffffffffffffb0 2: 1007f793 andi a5,a5,256 6: f7d9 c.bnez a5,0xffffffffffffff94 8: 37af50ef jal ra,0xf5382 c: d541 c.beqz a0,0xffffffffffffff94 e: b7d9 c.j 0xffffffffffffffd4 10: 00c87097 auipc ra,0xc87 14:* 614080e7 jalr ra,1556(ra) # 0xc87624 <-- trapping instruction Code starting with the faulting instruction =========================================== 0: 614080e7 jalr ra,1556(ra) [1] https://sourceware.org/bugzilla/show_bug.cgi?id=10263 Signed-off-by: Björn Töpel <[email protected]> Tested-by: Alexandre Ghiti <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent eb165bf commit 00b2425

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

scripts/decodecode

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,11 @@ disas() {
9393
${CROSS_COMPILE}strip $t.o
9494
fi
9595

96+
if [ "$ARCH" = "riscv" ]; then
97+
OBJDUMPFLAGS="-M no-aliases --section=.text -D"
98+
${CROSS_COMPILE}strip $t.o
99+
fi
100+
96101
if [ $pc_sub -ne 0 ]; then
97102
if [ $PC ]; then
98103
adj_vma=$(( $PC - $pc_sub ))
@@ -126,8 +131,13 @@ get_substr_opcode_bytes_num()
126131
do
127132
substr+="$opc"
128133

134+
opcode="$substr"
135+
if [ "$ARCH" = "riscv" ]; then
136+
opcode=$(echo $opcode | tr ' ' '\n' | tac | tr -d '\n')
137+
fi
138+
129139
# return if opcode bytes do not match @opline anymore
130-
if ! echo $opline | grep -q "$substr";
140+
if ! echo $opline | grep -q "$opcode";
131141
then
132142
break
133143
fi

0 commit comments

Comments
 (0)