fix stabs.texinfo xref bugs

[deliverable/binutils-gdb.git] / gdb / hppa-pinsn.c

diff --git a/gdb/hppa-pinsn.c b/gdb/hppa-pinsn.c
index 12df5f388fc94584cf8d2cf2a7d699c447ea56e0..87d5e7a6fe124a82c1d109653f4a914745a1c089 100644 (file)
--- a/gdb/hppa-pinsn.c
+++ b/gdb/hppa-pinsn.c
@@ -87,9 +87,10 @@ print_insn (memaddr, stream)
      CORE_ADDR memaddr;
      FILE *stream;
 {
-  unsigned int insn, i, op;
+  long insn;
+  unsigned int i, op;
 
-  read_memory (memaddr, &insn, sizeof (insn));
+  insn = read_memory_integer (memaddr, sizeof (insn));
 
   for (i = 0; i < NUMOPCODES; ++i)
     {
@@ -233,13 +234,13 @@ print_insn (memaddr, stream)
                  print_address (memaddr + 8 + extract_12 (insn), stream);
                  break;
                case 'W':
-                 /* don't interpret an address if it's an external branch
-                    instruction. */
                  op = GET_FIELD (insn, 0, 5);
-                 if (op != 0x38 /* be */ && op != 0x39 /* ble */)
-                   print_address (memaddr + 8 + extract_17 (insn), stream);
-                 else
+
+                 if (op == 0x38 /* be */ || op == 0x39 /* ble */)
                    fput_const (extract_17 (insn), stream);
+                 else
+                   print_address (memaddr + 8 + extract_17 (insn), stream);
+
                  break;
                case 'B':
                  {
@@ -257,6 +258,10 @@ print_insn (memaddr, stream)
                  fprintf_filtered (stream, "%d",
                                    GET_FIELD (insn, 22, 26));
                  break;
+               case 'Q':
+                 fprintf_filtered (stream, "%d",
+                                   GET_FIELD (insn, 11, 15));
+                 break;
                case 'T':
                  fprintf_filtered (stream, "%d",
                                    32 - GET_FIELD (insn, 27, 31));
@@ -340,6 +345,35 @@ print_insn (memaddr, stream)
                  break;
                }
            }
+
+/* If this is an external branch, examine the previous instruction and see if
+   it was an ldil that loaded something into the same base reg.  If so, then
+   calculate the branch target from the constants in both instructions, and
+   print it out. */
+
+         op = GET_FIELD (insn, 0, 5);
+         if (op == 0x38 /* be */ || op == 0x39 /* ble */)
+           {
+             CORE_ADDR target_address;
+             long prev_insn;
+             int basereg, basereg_prev;
+
+             target_address = extract_17 (insn);
+             basereg = GET_FIELD (insn, 6, 10);
+             if (basereg != 0)
+               {
+                 prev_insn = read_memory_integer (memaddr - 4,
+                                                  sizeof(prev_insn));
+                 basereg_prev = GET_FIELD (prev_insn, 6, 10);
+
+                 if ((prev_insn & 0xfc000000) == 0x20000000 /* ldil */
+                     && basereg == basereg_prev)
+                   target_address += extract_21 (prev_insn);
+               }
+             fprintf_filtered (stream, "\t! ");
+             print_address (target_address, stream);
+           }
+
          return sizeof(insn);
        }
     }