From c27c0be38e1bd25d7cc84d6846da2bba5040991a Mon Sep 17 00:00:00 2001 From: Michael Chastain Date: Sun, 7 Apr 2002 15:15:50 +0000 Subject: [PATCH] 2002-04-07 Michael Chastain Merge from HEAD to fix PR gdb/381: 2002-04-04 Daniel Jacobowitz * mi-cmd-disas.c (mi_cmd_disassemble): Skip end-of-function markers in the line table. --- gdb/mi/ChangeLog | 9 +++++++++ gdb/mi/mi-cmd-disas.c | 6 +++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/gdb/mi/ChangeLog b/gdb/mi/ChangeLog index 7b71e8a92b5..2bb94d7d41a 100644 --- a/gdb/mi/ChangeLog +++ b/gdb/mi/ChangeLog @@ -1,3 +1,12 @@ +2002-04-07 Michael Chastain + + Merge from HEAD to fix PR gdb/381: + + 2002-04-04 Daniel Jacobowitz + + * mi-cmd-disas.c (mi_cmd_disassemble): Skip end-of-function + markers in the line table. + 2002-02-24 Andrew Cagney From wiz at danbala: diff --git a/gdb/mi/mi-cmd-disas.c b/gdb/mi/mi-cmd-disas.c index afaf31c4372..7596c068271 100644 --- 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; -- 2.47.3