ld/testsuite/

2076-02-05  H.J. Lu  <hongjiu.lu@intel.com>

	* ld-i386/pcrel16.d: Undo the last change.
	* ld-x86-64/pcrel16.d: Likewise.

opcodes/

2076-02-05  H.J. Lu  <hongjiu.lu@intel.com>

	* i386-dis.c (OP_J): Undo the last change. Properly handle 64K
	wrap around within the same segment in 16bit mode.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 9814ca30dc35067a7881306b1e35d0f3e3e72cca..75a579d3e0e4d50827bf68bfff6c41e43180d781 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2076-02-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * ld-i386/pcrel16.d: Undo the last change.
+       * ld-x86-64/pcrel16.d: Likewise.
+
 2076-02-02  H.J. Lu  <hongjiu.lu@intel.com>
 
        * ld-i386/pcrel16.d: Updated.

diff --git a/ld/testsuite/ld-i386/pcrel16.d b/ld/testsuite/ld-i386/pcrel16.d
index 3df490797a8b1df57f08b52e6e78116fe7fd6514..3d45afeb42b4cf6d51d033bac346a5a37dedf3d0 100644 (file)
--- a/ld/testsuite/ld-i386/pcrel16.d
+++ b/ld/testsuite/ld-i386/pcrel16.d
@@ -12,4 +12,4 @@ Disassembly of section .text:
      420:      cd 42[  ]+int    \$0x42
      422:      ca 02 00[       ]+lret   \$0x2
        ...
-    f065:      e9 b8 13[       ]+jmp    10420 <__bss_start\+0x3b8>
+    f065:      e9 b8 13[       ]+jmp    420 <_start\+0x420>

diff --git a/ld/testsuite/ld-x86-64/pcrel16.d b/ld/testsuite/ld-x86-64/pcrel16.d
index 0ad5eef4df95594173102d2b17312472d1e0d3e6..f593657271f216325a50d79f6eec92e3649aff0e 100644 (file)
--- a/ld/testsuite/ld-x86-64/pcrel16.d
+++ b/ld/testsuite/ld-x86-64/pcrel16.d
@@ -12,4 +12,4 @@ Disassembly of section .text:
      420:      cd 42[  ]+int    \$0x42
      422:      ca 02 00[       ]+lret   \$0x2
        ...
-    f065:      e9 b8 13[       ]+jmp    10420 <_start\+0x10420>
+    f065:      e9 b8 13[       ]+jmp    420 <_start\+0x420>

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 2321dfab3f2eb5d940f82834a6c4d859ae57ae32..74f6d879c5086e41dc29967407ca1ab2d30472f7 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2076-02-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * i386-dis.c (OP_J): Undo the last change. Properly handle 64K
+       wrap around within the same segment in 16bit mode.
+
 2076-02-02  H.J. Lu  <hongjiu.lu@intel.com>
 
        * i386-dis.c (OP_J): Mask to 16bit only if there is a data16

diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 5ecc143559d7b61770c34774537bdc7a121babd0..509cc5d38a3b92f2e6af9e4a10f7868b90099ef6 100644 (file)
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -4901,6 +4901,7 @@ OP_J (int bytemode, int sizeflag)
 {
   bfd_vma disp;
   bfd_vma mask = -1;
+  bfd_vma segment = 0;
 
   switch (bytemode)
     {
@@ -4918,11 +4919,14 @@ OP_J (int bytemode, int sizeflag)
          disp = get16 ();
          if ((disp & 0x8000) != 0)
            disp -= 0x10000;
-         /* For some reason, a data16 prefix on a jump instruction
-            means that the pc is masked to 16 bits after the
-            displacement is added!  */
-         if ((prefixes & PREFIX_DATA) != 0)
-           mask = 0xffff;
+         /* In 16bit mode, address is wrapped around at 64k within
+            the same segment.  Otherwise, a data16 prefix on a jump
+            instruction means that the pc is masked to 16 bits after
+            the displacement is added!  */
+         mask = 0xffff;
+         if ((prefixes & PREFIX_DATA) == 0)
+           segment = ((start_pc + codep - start_codep)
+                      & ~((bfd_vma) 0xffff));
        }
       used_prefixes |= (prefixes & PREFIX_DATA);
       break;
@@ -4930,7 +4934,7 @@ OP_J (int bytemode, int sizeflag)
       oappend (INTERNAL_DISASSEMBLER_ERROR);
       return;
     }
-  disp = (start_pc + codep - start_codep + disp) & mask;
+  disp = ((start_pc + codep - start_codep + disp) & mask) | segment;
   set_op (disp, 0);
   print_operand_value (scratchbuf, 1, disp);
   oappend (scratchbuf);