From: Jeff Law <law@redhat.com>
Date: Fri, 19 May 2000 00:21:12 +0000 (+0000)
Subject:         * config/tc-hppa.c (md_apply_fix): Mask out immediate bits of
X-Git-Tag: readline-pre-41-import~444
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3b6a3fe2bdb4416f6be67c3425249cabd28fb80;p=thirdparty%2Fbinutils-gdb.git

    * config/tc-hppa.c (md_apply_fix): Mask out immediate bits of
        instruction to reflect change in re_assemble_*.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b38066bac14..fc9d9f8da8e 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-18  Alan Modra  <alan@linuxcare.com.au>
+
+	* config/tc-hppa.c (md_apply_fix): Mask out immediate bits of
+	instruction to reflect change in re_assemble_*.
+
 Thu May 18 10:52:14 2000  Jeffrey A Law  (law@cygnus.com)
 
 	* configure.in (hppa-*-hpux11*): If the cpu is hppa*64*, then
diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c
index 3876842873b..c57fd61ccff 100644
--- a/gas/config/tc-hppa.c
+++ b/gas/config/tc-hppa.c
@@ -4422,7 +4422,7 @@ md_apply_fix (fixP, valp)
 	  CHECK_FIELD (new_val, 1048576, -1048576, 0);
 	  val = new_val;
 
-	  insn = re_assemble_21 (insn, val);
+	  insn = re_assemble_21 (insn & ~ 0x1fffff, val);
 	  break;
 
 	/* Handle all the opcodes with the 'i' operand type.  */
@@ -4438,7 +4438,7 @@ md_apply_fix (fixP, valp)
 	  CHECK_FIELD (new_val, 8199, -8184, 0);
 	  val = new_val;
 
-	  insn = re_assemble_12 (insn, (val - 8) >> 2);
+	  insn = re_assemble_12 (insn & ~ 0x1ffd, (val - 8) >> 2);
 	  break;
 
 	/* Handle some of the opcodes with the 'W' operand type.  */
@@ -4455,7 +4455,7 @@ md_apply_fix (fixP, valp)
 	    CHECK_FIELD (new_val, 262143, -262144, 0);
 	    val = new_val;
 
-	    insn = re_assemble_17 (insn, (val - 8) >> 2);
+	    insn = re_assemble_17 (insn & ~ 0x1f1ffd, (val - 8) >> 2);
 	    break;
 	  }
 
@@ -4472,7 +4472,7 @@ md_apply_fix (fixP, valp)
 	    CHECK_FIELD (new_val, 8388607, -8388608, 0);
 	    val = new_val;
 
-	    insn = re_assemble_22 (insn, (val - 8) >> 2);
+	    insn = re_assemble_22 (insn & ~ 0x3ff1ffd, (val - 8) >> 2);
 	    break;
 	  }