espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-28 23:39:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

coff-z80 reloc howto fixes

Browse Source 
Mostly cosmetic unless attempting to link coff-z80 into another output
format.

	* coff-z80.c (howto_table <R_IMM24, R_WORD0, R_WORD1>): Correct size.
	(extra_case): Use bfd_{get,put}_24 when applying R_IMM24.
This commit is contained in:
Alan Modra
2022-06-08 13:26:27 +09:30
parent ff50916f8b
commit 24d34d81ea
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bfd/coff-z80.c
View File

@ -60,7 +60,7 @@ static bfd_howto_type howto_table[] =
BFD_HOWTO (BFD_RELOC_24, BFD_HOWTO (BFD_RELOC_24,
R_IMM24, /* type */ R_IMM24, /* type */
0, /* rightshift */ 0, /* rightshift */
1, /* size (0 = byte, 1 = short, 2 = long) */ 5, /* size (0 = byte, 1 = short, 2 = long) */
24, /* bitsize */ 24, /* bitsize */
false, /* pc_relative */ false, /* pc_relative */
0, /* bitpos */ 0, /* bitpos */
@ -195,7 +195,7 @@ static bfd_howto_type howto_table[] =
BFD_HOWTO (BFD_RELOC_Z80_WORD0, BFD_HOWTO (BFD_RELOC_Z80_WORD0,
R_WORD0, /* type */ R_WORD0, /* type */
0, /* rightshift */ 0, /* rightshift */
0, /* size (0 = byte, 1 = short, 2 = long) */ 1, /* size (0 = byte, 1 = short, 2 = long) */
16, /* bitsize */ 16, /* bitsize */
false, /* pc_relative */ false, /* pc_relative */
0, /* bitpos */ 0, /* bitpos */
@ -210,7 +210,7 @@ static bfd_howto_type howto_table[] =
BFD_HOWTO (BFD_RELOC_Z80_WORD1, BFD_HOWTO (BFD_RELOC_Z80_WORD1,
R_WORD1, /* type */ R_WORD1, /* type */
16, /* rightshift */ 16, /* rightshift */
0, /* size (0 = byte, 1 = short, 2 = long) */ 1, /* size (0 = byte, 1 = short, 2 = long) */
16, /* bitsize */ 16, /* bitsize */
false, /* pc_relative */ false, /* pc_relative */
0, /* bitpos */ 0, /* bitpos */
@ -405,11 +405,9 @@ extra_case (bfd *in_abfd,
case R_IMM24: case R_IMM24:
if (reloc->howto->partial_inplace) if (reloc->howto->partial_inplace)
val += (bfd_get_16 ( in_abfd, data+*src_ptr) val += (bfd_get_24 (in_abfd, data + *src_ptr)
+ (bfd_get_8 ( in_abfd, data+*src_ptr+2) << 16)) & reloc->howto->src_mask);
& reloc->howto->src_mask; bfd_put_24 (in_abfd, val, data + *dst_ptr);
bfd_put_16 (in_abfd, val, data + *dst_ptr);
bfd_put_8 (in_abfd, val >> 16, data + *dst_ptr+2);
(*dst_ptr) += 3; (*dst_ptr) += 3;
(*src_ptr) += 3; (*src_ptr) += 3;
break; break;