Sun Sep 27 18:52:57 2009 UTC ()
Remove old mis-merge.


(skrll)
diff -r1.2 -r1.3 src/external/gpl3/binutils/dist/opcodes/sparc-dis.c

cvs diff -r1.2 -r1.3 src/external/gpl3/binutils/dist/opcodes/sparc-dis.c (expand / switch to unified diff)

--- src/external/gpl3/binutils/dist/opcodes/sparc-dis.c 2009/08/19 07:19:32 1.2
+++ src/external/gpl3/binutils/dist/opcodes/sparc-dis.c 2009/09/27 18:52:56 1.3
@@ -947,27 +947,27 @@ print_insn_sparc (bfd_vma memaddr, disas @@ -947,27 +947,27 @@ print_insn_sparc (bfd_vma memaddr, disas
947 947
948 prev_insn = getword (buffer); 948 prev_insn = getword (buffer);
949 949
950 if (errcode == 0) 950 if (errcode == 0)
951 { 951 {
952 /* If it is a delayed branch, we need to look at the 952 /* If it is a delayed branch, we need to look at the
953 instruction before the delayed branch. This handles 953 instruction before the delayed branch. This handles
954 sequences such as: 954 sequences such as:
955 955
956 sethi %o1, %hi(_foo), %o1 956 sethi %o1, %hi(_foo), %o1
957 call _printf 957 call _printf
958 or %o1, %lo(_foo), %o1 */ 958 or %o1, %lo(_foo), %o1 */
959 959
960 if (memaddr >= 8 && is_delayed_branch (prev_insn)) 960 if (is_delayed_branch (prev_insn))
961 { 961 {
962 if (memaddr >= 8) 962 if (memaddr >= 8)
963 errcode = (*info->read_memory_func) 963 errcode = (*info->read_memory_func)
964 (memaddr - 8, buffer, sizeof (buffer), info); 964 (memaddr - 8, buffer, sizeof (buffer), info);
965 else 965 else
966 errcode = 1; 966 errcode = 1;
967 967
968 prev_insn = getword (buffer); 968 prev_insn = getword (buffer);
969 } 969 }
970 } 970 }
971 971
972 /* If there was a problem reading memory, then assume 972 /* If there was a problem reading memory, then assume
973 the previous instruction was not sethi. */ 973 the previous instruction was not sethi. */