mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-21 04:42:53 +08:00
f786c359c1
For now we should always generate the elf architecture attribute both for elf and linux toolchains, so that we could dump the objects correctly according to the generated architecture string. This patch resolves the problem that we probably dump an object with c.nop instructions, but in fact the c extension isn't allowed. Consider the following case, nelson@LAPTOP-QFSGI1F2:~/test$ cat temp.s .option norvc .option norelax .text add a0, a0, a0 .byte 0x1 .balign 16 nelson@LAPTOP-QFSGI1F2:~/test$ ~/binutils-dev/build-elf32-upstream/build-install/bin/riscv32-unknown-elf-as temp.s -o temp.o nelson@LAPTOP-QFSGI1F2:~/test$ ~/binutils-dev/build-elf32-upstream/build-install/bin/riscv32-unknown-elf-objdump -d temp.o temp.o: file format elf32-littleriscv Disassembly of section .text: 00000000 <.text>: 0: 00a50533 add a0,a0,a0 4: 01 .byte 0x01 5: 00 .byte 0x00 6: 0001 nop 8: 00000013 nop c: 00000013 nop nelson@LAPTOP-QFSGI1F2:~/test$ ~/binutils-dev/build-elf32-upstream/build-install/bin/riscv32-unknown-elf-readelf -A temp.o Attribute Section: riscv File Attributes Tag_RISCV_arch: "rv32i2p0_m2p0_a2p0_f2p0_d2p0" The c.nop at address 0x6 is generated for alignment, but since the rvc isn't allowed for this object, dump it as a c.nop instruction looks wrong. After applying this patch, I get the following result, nelson@LAPTOP-QFSGI1F2:~/test$ ~/binutils-dev/build-elf32-upstream/build-install/bin/riscv32-unknown-elf-objdump -d temp.o temp.o: file format elf32-littleriscv Disassembly of section .text: 00000000 <.text>: 0: 00a50533 add a0,a0,a0 4: 01 .byte 0x01 5: 00 .byte 0x00 6: 0001 .2byte 0x1 8: 00000013 nop c: 00000013 nop For the current objdump, we dump data to .byte/.short/.word/.dword, and dump the unknown or unsupported instructions to .2byte/.4byte/.8byte, which respectively are 2, 4 and 8 bytes instructions. Therefore, we shouldn't dump the 0x0001 as a c.nop instruction in the above case, we should dump it to .2byte 0x1 as a unknown instruction, since the rvc is disabled. However, consider that some people may use the new objdump to dump the old objects, which don't have any elf attributes. We usually set the default architecture string to rv64g by bfd/elfxx-riscv.c:riscv_set_default_arch. But this will cause rvc instructions to be unrecognized. Therefore, we set the default architecture string to rv64gc for disassembler, to keep the previous behavior. This patch pass the riscv-gnu-toolchain gcc/binutils regressions for rv32emc-elf, rv32gc-linux, rv32i-elf, rv64gc-elf and rv64gc-linux toolchains. Also, tested by --enable-targets=all and can build riscv-gdb successfully. bfd/ * elfnn-riscv.c (riscv_merge_arch_attr_info): Tidy the codes for riscv_parse_subset_t setting. * elfxx-riscv.c (riscv_get_default_ext_version): Updated. (riscv_subset_supports): Moved from gas/config/tc-riscv.c. (riscv_multi_subset_supports): Likewise. * elfxx-riscv.h: Added extern for riscv_subset_supports and riscv_multi_subset_supports. gas/ * config/tc-riscv.c (riscv_subset_supports): Moved to bfd/elfxx-riscv.c. (riscv_multi_subset_supports): Likewise. (riscv_rps_as): Defined for architectrue parser. (riscv_set_arch): Updated. (riscv_set_abi_by_arch): Likewise. (riscv_csr_address): Likewise. (reg_lookup_internal): Likewise. (riscv_ip): Likewise. (s_riscv_option): Updated. * testsuite/gas/riscv/mapping-04b.d: Updated. * testsuite/gas/riscv/mapping-norelax-03b.d: Likewise. * testsuite/gas/riscv/mapping-norelax-04b.d: Likewise. opcodes/ * riscv-dis.c: Include elfxx-riscv.h since we need the architecture parser. Also removed the cpu-riscv.h, it is already included in elfxx-riscv.h. (default_isa_spec): Defined since the parser need this to set the default architecture string. (xlen): Moved out from riscv_disassemble_insn as a global variable, it is more convenient to initialize riscv_rps_dis. (riscv_subsets): Defined to recoed the supported extensions. (riscv_rps_dis): Defined for architectrue parser. (riscv_disassemble_insn): Call riscv_multi_subset_supports to make sure if the instructions are valid or not. (print_insn_riscv): Initialize the riscv_subsets by parsing the elf architectrue attribute. Otherwise, set the default architectrue string to rv64gc. |
||
|---|---|---|
| .. | ||
| po | ||
| .gitignore | ||
| aarch64-asm-2.c | ||
| aarch64-asm.c | ||
| aarch64-asm.h | ||
| aarch64-dis-2.c | ||
| aarch64-dis.c | ||
| aarch64-dis.h | ||
| aarch64-gen.c | ||
| aarch64-opc-2.c | ||
| aarch64-opc.c | ||
| aarch64-opc.h | ||
| aarch64-tbl.h | ||
| aclocal.m4 | ||
| alpha-dis.c | ||
| alpha-opc.c | ||
| arc-dis.c | ||
| arc-dis.h | ||
| arc-ext-tbl.h | ||
| arc-ext.c | ||
| arc-ext.h | ||
| arc-fxi.h | ||
| arc-nps400-tbl.h | ||
| arc-opc.c | ||
| arc-regs.h | ||
| arc-tbl.h | ||
| arm-dis.c | ||
| avr-dis.c | ||
| bfin-dis.c | ||
| bpf-asm.c | ||
| bpf-desc.c | ||
| bpf-desc.h | ||
| bpf-dis.c | ||
| bpf-ibld.c | ||
| bpf-opc.c | ||
| bpf-opc.h | ||
| cgen-asm.c | ||
| cgen-asm.in | ||
| cgen-bitset.c | ||
| cgen-dis.c | ||
| cgen-dis.in | ||
| cgen-ibld.in | ||
| cgen-opc.c | ||
| cgen.sh | ||
| ChangeLog | ||
| ChangeLog-0001 | ||
| ChangeLog-0203 | ||
| ChangeLog-2004 | ||
| ChangeLog-2005 | ||
| ChangeLog-2006 | ||
| ChangeLog-2007 | ||
| ChangeLog-2008 | ||
| ChangeLog-2009 | ||
| ChangeLog-2010 | ||
| ChangeLog-2011 | ||
| ChangeLog-2012 | ||
| ChangeLog-2013 | ||
| ChangeLog-2014 | ||
| ChangeLog-2015 | ||
| ChangeLog-2016 | ||
| ChangeLog-2017 | ||
| ChangeLog-2018 | ||
| ChangeLog-2019 | ||
| ChangeLog-2020 | ||
| ChangeLog-9297 | ||
| ChangeLog-9899 | ||
| config.in | ||
| configure | ||
| configure.ac | ||
| configure.com | ||
| cr16-dis.c | ||
| cr16-opc.c | ||
| cris-desc.c | ||
| cris-desc.h | ||
| cris-dis.c | ||
| cris-opc.c | ||
| cris-opc.h | ||
| crx-dis.c | ||
| crx-opc.c | ||
| csky-dis.c | ||
| csky-opc.h | ||
| d10v-dis.c | ||
| d10v-opc.c | ||
| d30v-dis.c | ||
| d30v-opc.c | ||
| dep-in.sed | ||
| dis-buf.c | ||
| dis-init.c | ||
| disassemble.c | ||
| disassemble.h | ||
| dlx-dis.c | ||
| epiphany-asm.c | ||
| epiphany-desc.c | ||
| epiphany-desc.h | ||
| epiphany-dis.c | ||
| epiphany-ibld.c | ||
| epiphany-opc.c | ||
| epiphany-opc.h | ||
| fr30-asm.c | ||
| fr30-desc.c | ||
| fr30-desc.h | ||
| fr30-dis.c | ||
| fr30-ibld.c | ||
| fr30-opc.c | ||
| fr30-opc.h | ||
| frv-asm.c | ||
| frv-desc.c | ||
| frv-desc.h | ||
| frv-dis.c | ||
| frv-ibld.c | ||
| frv-opc.c | ||
| frv-opc.h | ||
| ft32-dis.c | ||
| ft32-opc.c | ||
| h8300-dis.c | ||
| hppa-dis.c | ||
| i386-dis-evex-len.h | ||
| i386-dis-evex-mod.h | ||
| i386-dis-evex-prefix.h | ||
| i386-dis-evex-reg.h | ||
| i386-dis-evex-w.h | ||
| i386-dis-evex.h | ||
| i386-dis.c | ||
| i386-gen.c | ||
| i386-init.h | ||
| i386-opc.c | ||
| i386-opc.h | ||
| i386-opc.tbl | ||
| i386-reg.tbl | ||
| i386-tbl.h | ||
| ia64-asmtab.c | ||
| ia64-asmtab.h | ||
| ia64-dis.c | ||
| ia64-gen.c | ||
| ia64-ic.tbl | ||
| ia64-opc-a.c | ||
| ia64-opc-b.c | ||
| ia64-opc-d.c | ||
| ia64-opc-f.c | ||
| ia64-opc-i.c | ||
| ia64-opc-m.c | ||
| ia64-opc-x.c | ||
| ia64-opc.c | ||
| ia64-opc.h | ||
| ia64-raw.tbl | ||
| ia64-war.tbl | ||
| ia64-waw.tbl | ||
| ip2k-asm.c | ||
| ip2k-desc.c | ||
| ip2k-desc.h | ||
| ip2k-dis.c | ||
| ip2k-ibld.c | ||
| ip2k-opc.c | ||
| ip2k-opc.h | ||
| iq2000-asm.c | ||
| iq2000-desc.c | ||
| iq2000-desc.h | ||
| iq2000-dis.c | ||
| iq2000-ibld.c | ||
| iq2000-opc.c | ||
| iq2000-opc.h | ||
| lm32-asm.c | ||
| lm32-desc.c | ||
| lm32-desc.h | ||
| lm32-dis.c | ||
| lm32-ibld.c | ||
| lm32-opc.c | ||
| lm32-opc.h | ||
| lm32-opinst.c | ||
| loongarch-coder.c | ||
| loongarch-dis.c | ||
| loongarch-opc.c | ||
| m32c-asm.c | ||
| m32c-desc.c | ||
| m32c-desc.h | ||
| m32c-dis.c | ||
| m32c-ibld.c | ||
| m32c-opc.c | ||
| m32c-opc.h | ||
| m32r-asm.c | ||
| m32r-desc.c | ||
| m32r-desc.h | ||
| m32r-dis.c | ||
| m32r-ibld.c | ||
| m32r-opc.c | ||
| m32r-opc.h | ||
| m32r-opinst.c | ||
| m68hc11-dis.c | ||
| m68hc11-opc.c | ||
| m68k-dis.c | ||
| m68k-opc.c | ||
| m10200-dis.c | ||
| m10200-opc.c | ||
| m10300-dis.c | ||
| m10300-opc.c | ||
| MAINTAINERS | ||
| Makefile.am | ||
| Makefile.in | ||
| makefile.vms | ||
| mcore-dis.c | ||
| mcore-opc.h | ||
| mep-asm.c | ||
| mep-desc.c | ||
| mep-desc.h | ||
| mep-dis.c | ||
| mep-ibld.c | ||
| mep-opc.c | ||
| mep-opc.h | ||
| metag-dis.c | ||
| microblaze-dis.c | ||
| microblaze-dis.h | ||
| microblaze-opc.h | ||
| microblaze-opcm.h | ||
| micromips-opc.c | ||
| mips16-opc.c | ||
| mips-dis.c | ||
| mips-formats.h | ||
| mips-opc.c | ||
| mmix-dis.c | ||
| mmix-opc.c | ||
| moxie-dis.c | ||
| moxie-opc.c | ||
| msp430-decode.c | ||
| msp430-decode.opc | ||
| msp430-dis.c | ||
| mt-asm.c | ||
| mt-desc.c | ||
| mt-desc.h | ||
| mt-dis.c | ||
| mt-ibld.c | ||
| mt-opc.c | ||
| mt-opc.h | ||
| nds32-asm.c | ||
| nds32-asm.h | ||
| nds32-dis.c | ||
| nds32-opc.h | ||
| nfp-dis.c | ||
| nios2-dis.c | ||
| nios2-opc.c | ||
| ns32k-dis.c | ||
| opc2c.c | ||
| opintl.h | ||
| or1k-asm.c | ||
| or1k-desc.c | ||
| or1k-desc.h | ||
| or1k-dis.c | ||
| or1k-ibld.c | ||
| or1k-opc.c | ||
| or1k-opc.h | ||
| or1k-opinst.c | ||
| pdp11-dis.c | ||
| pdp11-opc.c | ||
| pj-dis.c | ||
| pj-opc.c | ||
| ppc-dis.c | ||
| ppc-opc.c | ||
| pru-dis.c | ||
| pru-opc.c | ||
| riscv-dis.c | ||
| riscv-opc.c | ||
| rl78-decode.c | ||
| rl78-decode.opc | ||
| rl78-dis.c | ||
| rx-decode.c | ||
| rx-decode.opc | ||
| rx-dis.c | ||
| s12z-dis.c | ||
| s12z-opc.c | ||
| s12z-opc.h | ||
| s390-dis.c | ||
| s390-mkopc.c | ||
| s390-opc.c | ||
| s390-opc.txt | ||
| score7-dis.c | ||
| score-dis.c | ||
| score-opc.h | ||
| sh-dis.c | ||
| sh-opc.h | ||
| sparc-dis.c | ||
| sparc-opc.c | ||
| spu-dis.c | ||
| spu-opc.c | ||
| stamp-h.in | ||
| sysdep.h | ||
| tic4x-dis.c | ||
| tic6x-dis.c | ||
| tic30-dis.c | ||
| tic54x-dis.c | ||
| tic54x-opc.c | ||
| tilegx-dis.c | ||
| tilegx-opc.c | ||
| tilepro-dis.c | ||
| tilepro-opc.c | ||
| v850-dis.c | ||
| v850-opc.c | ||
| vax-dis.c | ||
| visium-dis.c | ||
| visium-opc.c | ||
| wasm32-dis.c | ||
| xc16x-asm.c | ||
| xc16x-desc.c | ||
| xc16x-desc.h | ||
| xc16x-dis.c | ||
| xc16x-ibld.c | ||
| xc16x-opc.c | ||
| xc16x-opc.h | ||
| xgate-dis.c | ||
| xgate-opc.c | ||
| xstormy16-asm.c | ||
| xstormy16-desc.c | ||
| xstormy16-desc.h | ||
| xstormy16-dis.c | ||
| xstormy16-ibld.c | ||
| xstormy16-opc.c | ||
| xstormy16-opc.h | ||
| xtensa-dis.c | ||
| z8k-dis.c | ||
| z8k-opc.h | ||
| z8kgen.c | ||
| z80-dis.c | ||