* [PATCH,V1 0/1] RISC-V: Make R_RISCV_SUB6 conforms to riscv abi standard
@ 2022-11-15 6:51 zengxiao
2022-11-15 6:51 ` [PATCH,V1 1/1] " zengxiao
0 siblings, 1 reply; 4+ messages in thread
From: zengxiao @ 2022-11-15 6:51 UTC (permalink / raw)
To: gcc-patches; +Cc: kito.cheng, andrew, shihua, zengxiao
From: zengxiao <zengxiao@eswincomputing.com>
Hi all RISC-V folks:
When riscv-objdump is used to generate dwarf information, problems are found, like:
DW_CFA_??? (User defined call frame op: 0x3c)
This error is related to that riscv-objdump does not follow the riscv R_RISCV_SUB6 standard.
Riscv-readelf is correct because it follows the R_RISCV_SUB6 standard.
There are test cases in https://github.com/zeng-xiao/gnu-bug-fix/tree/main/EG-769
that describe the error in detail.
zengxiao (1):
RISC-V: Make R_RISCV_SUB6 conforms to riscv abi standard
bfd/elfxx-riscv.c | 7 +++++
.../testsuite/binutils-all/riscv/dwarf-SUB6.d | 31 +++++++++++++++++++
.../testsuite/binutils-all/riscv/dwarf-SUB6.s | 12 +++++++
3 files changed, 50 insertions(+)
create mode 100644 binutils/testsuite/binutils-all/riscv/dwarf-SUB6.d
create mode 100644 binutils/testsuite/binutils-all/riscv/dwarf-SUB6.s
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH,V1 1/1] RISC-V: Make R_RISCV_SUB6 conforms to riscv abi standard
2022-11-15 6:51 [PATCH,V1 0/1] RISC-V: Make R_RISCV_SUB6 conforms to riscv abi standard zengxiao
@ 2022-11-15 6:51 ` zengxiao
0 siblings, 0 replies; 4+ messages in thread
From: zengxiao @ 2022-11-15 6:51 UTC (permalink / raw)
To: gcc-patches; +Cc: kito.cheng, andrew, shihua, zengxiao, gaofei
From: zengxiao <zengxiao@eswincomputing.com>
This patch makes R_RISCV_SUB6 conforms to riscv abi standard.
R_RISCV_SUB6 only the lower 6 bits of the code are valid.
The proposed specification which can be found in 8.5. Relocations of,
https://github.com/riscv-non-isa/riscv-elf-psabi-doc/releases/download/v1.0-rc4/riscv-abi.pdf
bfd/ChangeLog:
* elfxx-riscv.c (riscv_elf_add_sub_reloc):
binutils/ChangeLog:
* testsuite/binutils-all/riscv/dwarf-SUB6.d: New test.
* testsuite/binutils-all/riscv/dwarf-SUB6.s: New test.
reviewed-by: gaofei@eswincomputing.com
jinyanjiang@eswincomputing.com
Signed-off-by: zengxiao <zengxiao@eswincomputing.com>
---
bfd/elfxx-riscv.c | 7 +++++
.../testsuite/binutils-all/riscv/dwarf-SUB6.d | 31 +++++++++++++++++++
.../testsuite/binutils-all/riscv/dwarf-SUB6.s | 12 +++++++
3 files changed, 50 insertions(+)
create mode 100644 binutils/testsuite/binutils-all/riscv/dwarf-SUB6.d
create mode 100644 binutils/testsuite/binutils-all/riscv/dwarf-SUB6.s
diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c
index 300ccf49534..e71d4a456f2 100644
--- a/bfd/elfxx-riscv.c
+++ b/bfd/elfxx-riscv.c
@@ -994,6 +994,13 @@ riscv_elf_add_sub_reloc (bfd *abfd,
relocation = old_value + relocation;
break;
case R_RISCV_SUB6:
+ {
+ bfd_vma six_bit_valid_value = old_value & howto->dst_mask;
+ six_bit_valid_value -= relocation;
+ relocation = (six_bit_valid_value & howto->dst_mask) |
+ (old_value & ~howto->dst_mask);
+ }
+ break;
case R_RISCV_SUB8:
case R_RISCV_SUB16:
case R_RISCV_SUB32:
diff --git a/binutils/testsuite/binutils-all/riscv/dwarf-SUB6.d b/binutils/testsuite/binutils-all/riscv/dwarf-SUB6.d
new file mode 100644
index 00000000000..47d5ae570d7
--- /dev/null
+++ b/binutils/testsuite/binutils-all/riscv/dwarf-SUB6.d
@@ -0,0 +1,31 @@
+#PROG: objcopy
+#objdump: --dwarf=frames
+
+tmpdir/riscvcopy.o: file format elf32-littleriscv
+
+Contents of the .eh_frame section:
+
+
+00000000 00000020 00000000 CIE
+ Version: 3
+ Augmentation: "zR"
+ Code alignment factor: 1
+ Data alignment factor: -4
+ Return address column: 1
+ Augmentation data: 1b
+ DW_CFA_def_cfa_register: r2 \(sp\)
+ DW_CFA_def_cfa_offset: 48
+ DW_CFA_offset: r1 \(ra\) at cfa-4
+ DW_CFA_offset: r8 \(s0\) at cfa-8
+ DW_CFA_def_cfa: r8 \(s0\) ofs 0
+ DW_CFA_restore: r1 \(ra\)
+ DW_CFA_restore: r8 \(s0\)
+ DW_CFA_def_cfa: r2 \(sp\) ofs 48
+ DW_CFA_def_cfa_offset: 0
+ DW_CFA_nop
+
+00000024 00000010 00000028 FDE cie=00000000 pc=0000002c..0000002c
+ DW_CFA_nop
+ DW_CFA_nop
+ DW_CFA_nop
+
diff --git a/binutils/testsuite/binutils-all/riscv/dwarf-SUB6.s b/binutils/testsuite/binutils-all/riscv/dwarf-SUB6.s
new file mode 100644
index 00000000000..fe959f59d9b
--- /dev/null
+++ b/binutils/testsuite/binutils-all/riscv/dwarf-SUB6.s
@@ -0,0 +1,12 @@
+ .attribute arch, "rv32i2p0_m2p0_a2p0_f2p0_c2p0"
+ .cfi_startproc
+ .cfi_def_cfa_offset 48
+ .cfi_offset 1, -4
+ .cfi_offset 8, -8
+ .cfi_def_cfa 8, 0
+ .cfi_restore 1
+ .cfi_restore 8
+ .cfi_def_cfa 2, 48
+ .cfi_def_cfa_offset 0
+ .cfi_endproc
+
\ No newline at end of file
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH,V1 0/1] RISC-V: Make R_RISCV_SUB6 conforms to riscv abi standard
@ 2022-11-15 8:09 zengxiao
2022-11-15 8:09 ` [PATCH,V1 1/1] " zengxiao
0 siblings, 1 reply; 4+ messages in thread
From: zengxiao @ 2022-11-15 8:09 UTC (permalink / raw)
To: gcc-patches; +Cc: kito.cheng, andrew, shihua, zengxiao
From: zengxiao <zengxiao@eswincomputing.com>
Hi all RISC-V folks:
When riscv-objdump is used to generate dwarf information, problems are found, like:
DW_CFA_??? (User defined call frame op: 0x3c)
This error is related to that riscv-objdump does not follow the riscv R_RISCV_SUB6 standard.
Riscv-readelf is correct because it follows the R_RISCV_SUB6 standard.
There are test cases in https://github.com/zeng-xiao/gnu-bug-fix/tree/main/EG-769
that describe the error in detail.
zengxiao (1):
RISC-V: Make R_RISCV_SUB6 conforms to riscv abi standard
bfd/elfxx-riscv.c | 7 +++++
.../testsuite/binutils-all/riscv/dwarf-SUB6.d | 31 +++++++++++++++++++
.../testsuite/binutils-all/riscv/dwarf-SUB6.s | 12 +++++++
3 files changed, 50 insertions(+)
create mode 100644 binutils/testsuite/binutils-all/riscv/dwarf-SUB6.d
create mode 100644 binutils/testsuite/binutils-all/riscv/dwarf-SUB6.s
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH,V1 1/1] RISC-V: Make R_RISCV_SUB6 conforms to riscv abi standard
2022-11-15 8:09 [PATCH,V1 0/1] " zengxiao
@ 2022-11-15 8:09 ` zengxiao
0 siblings, 0 replies; 4+ messages in thread
From: zengxiao @ 2022-11-15 8:09 UTC (permalink / raw)
To: gcc-patches; +Cc: kito.cheng, andrew, shihua, zengxiao, gaofei
From: zengxiao <zengxiao@eswincomputing.com>
This patch makes R_RISCV_SUB6 conforms to riscv abi standard.
R_RISCV_SUB6 only the lower 6 bits of the code are valid.
The proposed specification which can be found in 8.5. Relocations of,
https://github.com/riscv-non-isa/riscv-elf-psabi-doc/releases/download/v1.0-rc4/riscv-abi.pdf
bfd/ChangeLog:
* elfxx-riscv.c (riscv_elf_add_sub_reloc):
binutils/ChangeLog:
* testsuite/binutils-all/riscv/dwarf-SUB6.d: New test.
* testsuite/binutils-all/riscv/dwarf-SUB6.s: New test.
reviewed-by: gaofei@eswincomputing.com
jinyanjiang@eswincomputing.com
Signed-off-by: zengxiao <zengxiao@eswincomputing.com>
---
bfd/elfxx-riscv.c | 7 +++++
.../testsuite/binutils-all/riscv/dwarf-SUB6.d | 31 +++++++++++++++++++
.../testsuite/binutils-all/riscv/dwarf-SUB6.s | 12 +++++++
3 files changed, 50 insertions(+)
create mode 100644 binutils/testsuite/binutils-all/riscv/dwarf-SUB6.d
create mode 100644 binutils/testsuite/binutils-all/riscv/dwarf-SUB6.s
diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c
index 300ccf49534..e71d4a456f2 100644
--- a/bfd/elfxx-riscv.c
+++ b/bfd/elfxx-riscv.c
@@ -994,6 +994,13 @@ riscv_elf_add_sub_reloc (bfd *abfd,
relocation = old_value + relocation;
break;
case R_RISCV_SUB6:
+ {
+ bfd_vma six_bit_valid_value = old_value & howto->dst_mask;
+ six_bit_valid_value -= relocation;
+ relocation = (six_bit_valid_value & howto->dst_mask) |
+ (old_value & ~howto->dst_mask);
+ }
+ break;
case R_RISCV_SUB8:
case R_RISCV_SUB16:
case R_RISCV_SUB32:
diff --git a/binutils/testsuite/binutils-all/riscv/dwarf-SUB6.d b/binutils/testsuite/binutils-all/riscv/dwarf-SUB6.d
new file mode 100644
index 00000000000..47d5ae570d7
--- /dev/null
+++ b/binutils/testsuite/binutils-all/riscv/dwarf-SUB6.d
@@ -0,0 +1,31 @@
+#PROG: objcopy
+#objdump: --dwarf=frames
+
+tmpdir/riscvcopy.o: file format elf32-littleriscv
+
+Contents of the .eh_frame section:
+
+
+00000000 00000020 00000000 CIE
+ Version: 3
+ Augmentation: "zR"
+ Code alignment factor: 1
+ Data alignment factor: -4
+ Return address column: 1
+ Augmentation data: 1b
+ DW_CFA_def_cfa_register: r2 \(sp\)
+ DW_CFA_def_cfa_offset: 48
+ DW_CFA_offset: r1 \(ra\) at cfa-4
+ DW_CFA_offset: r8 \(s0\) at cfa-8
+ DW_CFA_def_cfa: r8 \(s0\) ofs 0
+ DW_CFA_restore: r1 \(ra\)
+ DW_CFA_restore: r8 \(s0\)
+ DW_CFA_def_cfa: r2 \(sp\) ofs 48
+ DW_CFA_def_cfa_offset: 0
+ DW_CFA_nop
+
+00000024 00000010 00000028 FDE cie=00000000 pc=0000002c..0000002c
+ DW_CFA_nop
+ DW_CFA_nop
+ DW_CFA_nop
+
diff --git a/binutils/testsuite/binutils-all/riscv/dwarf-SUB6.s b/binutils/testsuite/binutils-all/riscv/dwarf-SUB6.s
new file mode 100644
index 00000000000..fe959f59d9b
--- /dev/null
+++ b/binutils/testsuite/binutils-all/riscv/dwarf-SUB6.s
@@ -0,0 +1,12 @@
+ .attribute arch, "rv32i2p0_m2p0_a2p0_f2p0_c2p0"
+ .cfi_startproc
+ .cfi_def_cfa_offset 48
+ .cfi_offset 1, -4
+ .cfi_offset 8, -8
+ .cfi_def_cfa 8, 0
+ .cfi_restore 1
+ .cfi_restore 8
+ .cfi_def_cfa 2, 48
+ .cfi_def_cfa_offset 0
+ .cfi_endproc
+
\ No newline at end of file
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH,V1 0/1] RISC-V: Make R_RISCV_SUB6 conforms to riscv abi standard
@ 2022-11-15 6:46 zengxiao
2022-11-15 6:46 ` [PATCH,V1 1/1] " zengxiao
0 siblings, 1 reply; 4+ messages in thread
From: zengxiao @ 2022-11-15 6:46 UTC (permalink / raw)
To: gcc-patches; +Cc: kito.cheng, andrew, shihua, cri-sw-toolchain, zengxiao
From: zengxiao <zengxiao@eswincomputing.com>
Hi all RISC-V folks:
When riscv-objdump is used to generate dwarf information, problems are found, like:
DW_CFA_??? (User defined call frame op: 0x3c)
This error is related to that riscv-objdump does not follow the riscv R_RISCV_SUB6 standard.
Riscv-readelf is correct because it follows the R_RISCV_SUB6 standard.
There are test cases in https://github.com/zeng-xiao/gnu-bug-fix/tree/main/EG-769
that describe the error in detail.
zengxiao (1):
RISC-V: Make R_RISCV_SUB6 conforms to riscv abi standard
bfd/elfxx-riscv.c | 7 +++++
.../testsuite/binutils-all/riscv/dwarf-SUB6.d | 31 +++++++++++++++++++
.../testsuite/binutils-all/riscv/dwarf-SUB6.s | 12 +++++++
3 files changed, 50 insertions(+)
create mode 100644 binutils/testsuite/binutils-all/riscv/dwarf-SUB6.d
create mode 100644 binutils/testsuite/binutils-all/riscv/dwarf-SUB6.s
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH,V1 1/1] RISC-V: Make R_RISCV_SUB6 conforms to riscv abi standard
2022-11-15 6:46 [PATCH,V1 0/1] " zengxiao
@ 2022-11-15 6:46 ` zengxiao
0 siblings, 0 replies; 4+ messages in thread
From: zengxiao @ 2022-11-15 6:46 UTC (permalink / raw)
To: gcc-patches; +Cc: kito.cheng, andrew, shihua, cri-sw-toolchain, zengxiao
From: zengxiao <zengxiao@eswincomputing.com>
This patch makes R_RISCV_SUB6 conforms to riscv abi standard.
R_RISCV_SUB6 only the lower 6 bits of the code are valid.
The proposed specification which can be found in 8.5. Relocations of,
https://github.com/riscv-non-isa/riscv-elf-psabi-doc/releases/download/v1.0-rc4/riscv-abi.pdf
bfd/ChangeLog:
* elfxx-riscv.c (riscv_elf_add_sub_reloc): Take the lower
6 bits as the significant bit
---
bfd/elfxx-riscv.c | 7 +++++
.../testsuite/binutils-all/riscv/dwarf-SUB6.d | 31 +++++++++++++++++++
.../testsuite/binutils-all/riscv/dwarf-SUB6.s | 12 +++++++
3 files changed, 50 insertions(+)
create mode 100644 binutils/testsuite/binutils-all/riscv/dwarf-SUB6.d
create mode 100644 binutils/testsuite/binutils-all/riscv/dwarf-SUB6.s
diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c
index 300ccf49534..e71d4a456f2 100644
--- a/bfd/elfxx-riscv.c
+++ b/bfd/elfxx-riscv.c
@@ -994,6 +994,13 @@ riscv_elf_add_sub_reloc (bfd *abfd,
relocation = old_value + relocation;
break;
case R_RISCV_SUB6:
+ {
+ bfd_vma six_bit_valid_value = old_value & howto->dst_mask;
+ six_bit_valid_value -= relocation;
+ relocation = (six_bit_valid_value & howto->dst_mask) |
+ (old_value & ~howto->dst_mask);
+ }
+ break;
case R_RISCV_SUB8:
case R_RISCV_SUB16:
case R_RISCV_SUB32:
diff --git a/binutils/testsuite/binutils-all/riscv/dwarf-SUB6.d b/binutils/testsuite/binutils-all/riscv/dwarf-SUB6.d
new file mode 100644
index 00000000000..47d5ae570d7
--- /dev/null
+++ b/binutils/testsuite/binutils-all/riscv/dwarf-SUB6.d
@@ -0,0 +1,31 @@
+#PROG: objcopy
+#objdump: --dwarf=frames
+
+tmpdir/riscvcopy.o: file format elf32-littleriscv
+
+Contents of the .eh_frame section:
+
+
+00000000 00000020 00000000 CIE
+ Version: 3
+ Augmentation: "zR"
+ Code alignment factor: 1
+ Data alignment factor: -4
+ Return address column: 1
+ Augmentation data: 1b
+ DW_CFA_def_cfa_register: r2 \(sp\)
+ DW_CFA_def_cfa_offset: 48
+ DW_CFA_offset: r1 \(ra\) at cfa-4
+ DW_CFA_offset: r8 \(s0\) at cfa-8
+ DW_CFA_def_cfa: r8 \(s0\) ofs 0
+ DW_CFA_restore: r1 \(ra\)
+ DW_CFA_restore: r8 \(s0\)
+ DW_CFA_def_cfa: r2 \(sp\) ofs 48
+ DW_CFA_def_cfa_offset: 0
+ DW_CFA_nop
+
+00000024 00000010 00000028 FDE cie=00000000 pc=0000002c..0000002c
+ DW_CFA_nop
+ DW_CFA_nop
+ DW_CFA_nop
+
diff --git a/binutils/testsuite/binutils-all/riscv/dwarf-SUB6.s b/binutils/testsuite/binutils-all/riscv/dwarf-SUB6.s
new file mode 100644
index 00000000000..fe959f59d9b
--- /dev/null
+++ b/binutils/testsuite/binutils-all/riscv/dwarf-SUB6.s
@@ -0,0 +1,12 @@
+ .attribute arch, "rv32i2p0_m2p0_a2p0_f2p0_c2p0"
+ .cfi_startproc
+ .cfi_def_cfa_offset 48
+ .cfi_offset 1, -4
+ .cfi_offset 8, -8
+ .cfi_def_cfa 8, 0
+ .cfi_restore 1
+ .cfi_restore 8
+ .cfi_def_cfa 2, 48
+ .cfi_def_cfa_offset 0
+ .cfi_endproc
+
\ No newline at end of file
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-11-15 8:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-15 6:51 [PATCH,V1 0/1] RISC-V: Make R_RISCV_SUB6 conforms to riscv abi standard zengxiao
2022-11-15 6:51 ` [PATCH,V1 1/1] " zengxiao
-- strict thread matches above, loose matches on Subject: below --
2022-11-15 8:09 [PATCH,V1 0/1] " zengxiao
2022-11-15 8:09 ` [PATCH,V1 1/1] " zengxiao
2022-11-15 6:46 [PATCH,V1 0/1] " zengxiao
2022-11-15 6:46 ` [PATCH,V1 1/1] " zengxiao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).