diff options
| -rw-r--r-- | bfd/ChangeLog | 7 | ||||
| -rw-r--r-- | bfd/elf-hppa.h | 6 | ||||
| -rw-r--r-- | bfd/libhppa.h | 20 |
3 files changed, 20 insertions, 13 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 795ba54..6a1d03b 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2000-05-18 Alan Modra <alan@linuxcare.com.au> + + * libhppa.h (re_assemble_3, re_assemble_12, re_assemble_16, + re_assemble_17, re_assemble_21, re_assemble_22): Don't mask insn. + (hppa_rebuild_insn): Mask immediate bits here instead. + * elf-hppa.h (elf_hppa_relocate_insn): Mask here too. + 2000-05-18 Momchil Velikov <velco@fadata.bg> * elflink.h (elf_bfd_final_link, elf_link_input_bfd): When emiting diff --git a/bfd/elf-hppa.h b/bfd/elf-hppa.h index 9b1e25d..e30f714 100644 --- a/bfd/elf-hppa.h +++ b/bfd/elf-hppa.h @@ -1965,7 +1965,7 @@ elf_hppa_relocate_insn (insn, sym_value, r_type) the "B" instruction. */ case R_PARISC_PCREL22F: case R_PARISC_PCREL22C: - return re_assemble_22 (insn, sym_value); + return re_assemble_22 (insn & ~ 0x3ff1ffd, sym_value); /* This is any 17bit branch. In PA2.0 syntax it also corresponds to the "B" instruction as well as BE. */ @@ -1974,7 +1974,7 @@ elf_hppa_relocate_insn (insn, sym_value, r_type) case R_PARISC_DIR17R: case R_PARISC_PCREL17C: case R_PARISC_PCREL17R: - return re_assemble_17 (insn, sym_value); + return re_assemble_17 (insn & ~ 0x1f1ffd, sym_value); /* ADDIL or LDIL instructions. */ case R_PARISC_DLTREL21L: @@ -1985,7 +1985,7 @@ elf_hppa_relocate_insn (insn, sym_value, r_type) case R_PARISC_DPREL21L: case R_PARISC_PLTOFF21L: case R_PARISC_DIR21L: - return re_assemble_21 (insn, sym_value); + return re_assemble_21 (insn & ~ 0x1fffff, sym_value); /* LDO and integer loads/stores with 14bit displacements. */ case R_PARISC_DLTREL14R: diff --git a/bfd/libhppa.h b/bfd/libhppa.h index ddb6efa..7a8af9a 100644 --- a/bfd/libhppa.h +++ b/bfd/libhppa.h @@ -390,7 +390,7 @@ re_assemble_3 (insn, as3) unsigned int insn; unsigned int as3; { - return ((insn & ~ (7 << 13)) + return (insn | ((as3 & 4) << (13-2)) | ((as3 & 3) << (13+1))); } @@ -400,7 +400,7 @@ re_assemble_12 (insn, as12) unsigned int insn; unsigned int as12; { - return ((insn & ~ 0x1ffd) + return (insn | ((as12 & 0x800) >> 11) | ((as12 & 0x400) >> (10 - 2)) | ((as12 & 0x3ff) << (1 + 2))); @@ -419,14 +419,14 @@ re_assemble_16 (insn, as16, wide) /* Unusual 16-bit encoding. */ t = (as16 << 1) & 0xffff; s = (as16 & 0x8000); - return (insn & ~ 0xffff) | (t ^ s ^ (s >> 1)) | (s >> 15); + return insn | (t ^ s ^ (s >> 1)) | (s >> 15); } else { /* Standard 14-bit encoding. */ t = (as16 << 1) & 0x3fff; s = (as16 & 0x2000); - return (insn & ~ 0xffff) | t | (s >> 13); + return insn | t | (s >> 13); } } @@ -435,7 +435,7 @@ re_assemble_17 (insn, as17) unsigned int insn; unsigned int as17; { - return ((insn & ~ 0x1f1ffd) + return (insn | ((as17 & 0x10000) >> 16) | ((as17 & 0x0f800) << (16 - 11)) | ((as17 & 0x00400) >> (10 - 2)) @@ -447,7 +447,7 @@ re_assemble_21 (insn, as21) unsigned int insn; unsigned int as21; { - return ((insn & ~ 0x1fffff) + return (insn | ((as21 & 0x100000) >> 20) | ((as21 & 0x0ffe00) >> 8) | ((as21 & 0x000180) << 7) @@ -460,7 +460,7 @@ re_assemble_22 (insn, as22) unsigned int insn; unsigned int as22; { - return ((insn & ~ 0x3ff1ffd) + return (insn | ((as22 & 0x200000) >> 21) | ((as22 & 0x1f0000) << (21 - 16)) | ((as22 & 0x00f800) << (16 - 11)) @@ -697,10 +697,10 @@ hppa_rebuild_insn (abfd, insn, value, r_format) switch (r_format) { case 11: return (insn & ~ 0x7ff) | low_sign_unext (value, 11); - case 12: return re_assemble_12 (insn, value); + case 12: return re_assemble_12 (insn & ~ 0x1ffd, value); case 14: return (insn & ~ 0x3fff) | low_sign_unext (value, 14); - case 17: return re_assemble_17 (insn, value); - case 21: return re_assemble_21 (insn, value); + case 17: return re_assemble_17 (insn & ~ 0x1f1ffd, value); + case 21: return re_assemble_21 (insn & ~ 0x1fffff, value); case 32: return value; default: |