diff options
| author | Arnold Metselaar <arnold.metselaar@planet.nl> | 2006-02-05 11:57:34 +0000 |
|---|---|---|
| committer | Arnold Metselaar <arnold.metselaar@planet.nl> | 2006-02-05 11:57:34 +0000 |
| commit | 3e0615615da925eda08017441b5f5ec304f12094 (patch) | |
| tree | edceab2dc32b03c8b9e261c8e1cf31c9068e0aa0 | |
| parent | 6d37a51db71ea65126d41a59ec7cfabb30d3bc22 (diff) | |
| download | gdb-3e0615615da925eda08017441b5f5ec304f12094.tar.gz | |
Cleanup of pseudo-ops for constants and new def24,def32 pseudo-ops on z80
| -rw-r--r-- | bfd/ChangeLog | 7 | ||||
| -rw-r--r-- | bfd/coff-z80.c | 21 | ||||
| -rw-r--r-- | include/coff/ChangeLog | 4 | ||||
| -rw-r--r-- | include/coff/internal.h | 1 |
4 files changed, 32 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f2ca17dcf48..4dcd1e75071 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2006-02-05 Arnold Metselaar <arnold.metselaar@planet.nl> + + * coff-z80.c (r_imm24): New howto. + (rtype2howto): New case R_IMM24. + (coff_z80_reloc_type_lookup): New case BFD_RELOC_24. + (extra_case): Use bfd_get_8 for R_IMM8, new case R_IMM24. + 2006-02-04 Richard Sandiford <richard@codesourcery.com> * elfxx-mips.c (mips_elf_initialize_tls_index): If a TLS symbol diff --git a/bfd/coff-z80.c b/bfd/coff-z80.c index f39413f6e9c..512c2b8677e 100644 --- a/bfd/coff-z80.c +++ b/bfd/coff-z80.c @@ -34,6 +34,11 @@ HOWTO (R_IMM32, 0, 1, 32, FALSE, 0, complain_overflow_dont, 0, "r_imm32", TRUE, 0xffffffff, 0xffffffff, FALSE); +static reloc_howto_type r_imm24 = +HOWTO (R_IMM24, 0, 1, 24, FALSE, 0, + complain_overflow_dont, 0, "r_imm24", TRUE, 0x00ffffff, 0x00ffffff, + FALSE); + static reloc_howto_type r_imm16 = HOWTO (R_IMM16, 0, 1, 16, FALSE, 0, complain_overflow_dont, 0, "r_imm16", TRUE, 0x0000ffff, 0x0000ffff, @@ -84,6 +89,9 @@ rtype2howto (arelent *internal, struct internal_reloc *dst) case R_IMM16: internal->howto = &r_imm16; break; + case R_IMM24: + internal->howto = &r_imm24; + break; case R_IMM32: internal->howto = &r_imm32; break; @@ -106,6 +114,7 @@ coff_z80_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, { case BFD_RELOC_8: return & r_imm8; case BFD_RELOC_16: return & r_imm16; + case BFD_RELOC_24: return & r_imm24; case BFD_RELOC_32: return & r_imm32; case BFD_RELOC_8_PCREL: return & r_jr; case BFD_RELOC_Z80_DISP8: return & r_off8; @@ -173,7 +182,7 @@ extra_case (bfd *in_abfd, break; case R_IMM8: - val = bfd_get_16 ( in_abfd, data+*src_ptr) + val = bfd_get_8 ( in_abfd, data+*src_ptr) + bfd_coff_reloc16_get_value (reloc, link_info, input_section); bfd_put_8 (in_abfd, val, data + *dst_ptr); (*dst_ptr) += 1; @@ -188,6 +197,16 @@ extra_case (bfd *in_abfd, (*src_ptr) += 2; break; + case R_IMM24: + val = bfd_get_16 ( in_abfd, data+*src_ptr) + + (bfd_get_8 ( in_abfd, data+*src_ptr+2) << 16) + + bfd_coff_reloc16_get_value (reloc, link_info, input_section); + bfd_put_16 (in_abfd, val, data + *dst_ptr); + bfd_put_8 (in_abfd, val >> 16, data + *dst_ptr+2); + (*dst_ptr) += 3; + (*src_ptr) += 3; + break; + case R_IMM32: val = bfd_get_32 ( in_abfd, data+*src_ptr) + bfd_coff_reloc16_get_value (reloc, link_info, input_section); diff --git a/include/coff/ChangeLog b/include/coff/ChangeLog index a8b66cce2af..f41c115bdad 100644 --- a/include/coff/ChangeLog +++ b/include/coff/ChangeLog @@ -1,3 +1,7 @@ +2006-02-05 Arnold Metselaar <arnold.metselaar@planet.nl> + + * internal.h: Add relocation number R_IMM24 for Z80. + 2005-10-25 Arnold Metselaar <arnold.metselaar@planet.nl> * internal.h: Add relocation number for Z80 diff --git a/include/coff/internal.h b/include/coff/internal.h index d7a83815aea..ed0918a6aea 100644 --- a/include/coff/internal.h +++ b/include/coff/internal.h @@ -717,6 +717,7 @@ struct internal_reloc /* Z80 modes */ #define R_OFF8 0x32 /* 8 bit signed abs, for (i[xy]+d) */ +#define R_IMM24 0x33 /* 24 bit abs */ /* R_JR, R_IMM8, R_IMM16, R_IMM32 - as for Z8k */ /* H8500 modes */ |