* ia64-tdep.c (fetch_instruction): Warn about slot numbers greater

	than two instead of generating an error.

2 files changed, 23 insertions, 1 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3e7846d..702d180 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-21  Kevin Buettner  <kevinb@redhat.com>
+
+	* ia64-tdep.c (fetch_instruction): Warn about slot numbers greater
+	than two instead of generating an error.
+	
 2001-03-21  Jim Blandy  <jimb@redhat.com>
 
 	* cp-valprint.c: Reformat to bring into line with GNU coding
diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c
index 5efd58a..e46c4b4 100644
--- a/gdb/ia64-tdep.c
+++ b/gdb/ia64-tdep.c
@@ -492,8 +492,25 @@ fetch_instruction (CORE_ADDR addr, instruction_type *it, long long *instr)
   long long template;
   int val;
 
+  /* Warn about slot numbers greater than 2.  We used to generate
+     an error here on the assumption that the user entered an invalid
+     address.  But, sometimes GDB itself requests an invalid address.
+     This can (easily) happen when execution stops in a function for
+     which there are no symbols.  The prologue scanner will attempt to
+     find the beginning of the function - if the nearest symbol
+     happens to not be aligned on a bundle boundary (16 bytes), the
+     resulting starting address will cause GDB to think that the slot
+     number is too large.
+
+     So we warn about it and set the slot number to zero.  It is
+     not necessarily a fatal condition, particularly if debugging
+     at the assembly language level.  */
   if (slotnum > 2)
-    error("Can't fetch instructions for slot numbers greater than 2.");
+    {
+      warning ("Can't fetch instructions for slot numbers greater than 2.\n"
+	       "Using slot 0 instead");
+      slotnum = 0;
+    }
 
   addr &= ~0x0f;