2002-04-07 Michael Chastain <mec@shout.net>

	Merge from HEAD to fix PR gdb/381:

	2002-04-04  Daniel Jacobowitz  <drow@mvista.com>

	* mi-cmd-disas.c (mi_cmd_disassemble): Skip end-of-function
 	markers in the line table.

diff --git a/gdb/mi/ChangeLog b/gdb/mi/ChangeLog
index 7b71e8a92b58cb6323f43625e39d537d8ef8f3ff..2bb94d7d41a7d36e15c282e25c23d18a28eab6dc 100644 (file)
--- a/gdb/mi/ChangeLog
+++ b/gdb/mi/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-07  Michael Chastain  <mec@shout.net>
+
+       Merge from HEAD to fix PR gdb/381:
+
+       2002-04-04  Daniel Jacobowitz  <drow@mvista.com>
+
+       * mi-cmd-disas.c (mi_cmd_disassemble): Skip end-of-function
+       markers in the line table.
+ 
 2002-02-24  Andrew Cagney  <ac131313@redhat.com>
 
        From wiz at danbala:

diff --git a/gdb/mi/mi-cmd-disas.c b/gdb/mi/mi-cmd-disas.c
index afaf31c4372f52a9c837ee5b682611d70ab06e70..7596c0682711247d56b823f1c1b03a29bb4f7db6 100644 (file)
--- a/gdb/mi/mi-cmd-disas.c
+++ b/gdb/mi/mi-cmd-disas.c
@@ -1,5 +1,5 @@
 /* MI Command Set - disassemble commands.
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by Cygnus Solutions (a Red Hat company).
 
    This file is part of GDB.
@@ -332,6 +332,10 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
              && le[i].pc == le[i + 1].pc)
            continue;           /* Ignore duplicates */
 
+         /* Skip any end-of-function markers.  */
+         if (le[i].line == 0)
+           continue;
+
          mle[newlines].line = le[i].line;
          if (le[i].line > le[i + 1].line)
            out_of_order = 1;