* Patches from Jeffrey Law <law@cs.utah.edu>.

	* gdb/hppa-pinsn.c (print_insn): Handle 'r' and 'R' for break, rsm,
	and ssm instructions.
	* gdb/hppa-tdep.c (extract_5r_store, extract_5R_store): New
	helper functions for print_insn.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cc0309da618282c882f69201856c573e5e6db7ca..ae489effaa34c479fc4d44801819668e9936e5b8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,6 +1,10 @@
 Wed May  5 15:16:33 1993  Stu Grossman  (grossman@cygnus.com)
 
         * Patches from Jeffrey Law <law@cs.utah.edu>.
+       * gdb/hppa-pinsn.c (print_insn): Handle 'r' and 'R' for break, rsm,
+       and ssm instructions.
+       * gdb/hppa-tdep.c (extract_5r_store, extract_5R_store): New
+       helper functions for print_insn.
        * gdb/hppa-tdep.c (gcc_p, hpux_cc_p): Delete unused functions.
        * gdb/config/pa/tm-hppa.h (ABOUT_TO_RETURN): Handle a return
        which nullifies the following instruction.

diff --git a/gdb/hppa-pinsn.c b/gdb/hppa-pinsn.c
index 87d5e7a6fe124a82c1d109653f4a914745a1c089..8b39e416259f3d13fbc2f8b2649b85fc35cf149b 100644 (file)
--- a/gdb/hppa-pinsn.c
+++ b/gdb/hppa-pinsn.c
@@ -215,6 +215,12 @@ print_insn (memaddr, stream)
                case 'V':
                  fput_const (extract_5_store (insn), stream);
                  break;
+               case 'r':
+                 fput_const (extract_5r_store (insn), stream);
+                 break;
+               case 'R':
+                 fput_const (extract_5R_store (insn), stream);
+                 break;
                case 'i':
                  fput_const (extract_11 (insn), stream);
                  break;

diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index 5f574d1c8a0c703dca2dd6b0aca4f21099de6185..49af79ea12959416729d70d47eb398d13533d111 100644 (file)
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -125,6 +125,24 @@ extract_5_store (word)
   return low_sign_extend (word & MASK_5, 5);
 }
 
+/* extract the immediate field from a break instruction */
+
+unsigned
+extract_5r_store (word)
+     unsigned word;
+{
+  return (word & MASK_5);
+}
+
+/* extract the immediate field from a {sr}sm instruction */
+
+unsigned
+extract_5R_store (word)
+     unsigned word;
+{
+  return (word >> 16 & MASK_5);
+}
+
 /* extract an 11 bit immediate field */
 
 int