From: markus.t.metzger@intel.com
To: jan.kratochvil@redhat.com
Cc: gdb-patches@sourceware.org, markus.t.metzger@gmail.com,
Markus Metzger <markus.t.metzger@intel.com>
Subject: [PATCH 02/17] source: add flags to print_source_lines ()
Date: Wed, 06 Jun 2012 12:34:00 -0000 [thread overview]
Message-ID: <1338985955-28749-3-git-send-email-markus.t.metzger@intel.com> (raw)
In-Reply-To: <1338985955-28749-1-git-send-email-markus.t.metzger@intel.com>
From: Markus Metzger <markus.t.metzger@intel.com>
The 4th parameter of print_source_lines is a boolean flag noerror. Generalize
this to be a bit vector of flags and make noerror one of the flag bits.
2012-06-06 Markus Metzger <markus.t.metzger@intel.com>
gdb/
* symtab.h (print_source_lines_flags): New enum.
* source.c (print_source_lines_base): Change noerror to flags.
(print_source_lines): Change noerror to flags.
---
gdb/source.c | 16 ++++++++--------
gdb/symtab.h | 10 +++++++++-
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/gdb/source.c b/gdb/source.c
index 7de86b4..e2a87e7 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1244,10 +1244,9 @@ identify_source_line (struct symtab *s, int line, int mid_statement,
/* Print source lines from the file of symtab S,
starting with line number LINE and stopping before line number STOPLINE. */
-static void print_source_lines_base (struct symtab *s, int line, int stopline,
- int noerror);
static void
-print_source_lines_base (struct symtab *s, int line, int stopline, int noerror)
+print_source_lines_base (struct symtab *s, int line, int stopline,
+ enum print_source_lines_flags flags)
{
int c;
int desc;
@@ -1275,13 +1274,13 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror)
else
{
desc = last_source_error;
- noerror = 1;
+ flags |= PRINT_SOURCE_LINES_NOERROR;
}
}
else
{
desc = last_source_error;
- noerror = 1;
+ flags |= PRINT_SOURCE_LINES_NOERROR;
noprint = 1;
}
@@ -1289,7 +1288,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror)
{
last_source_error = desc;
- if (!noerror)
+ if (!(flags & PRINT_SOURCE_LINES_NOERROR))
{
char *name = alloca (strlen (s->filename) + 100);
sprintf (name, "%d\t%s", line, s->filename);
@@ -1375,9 +1374,10 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror)
window otherwise it is simply printed. */
void
-print_source_lines (struct symtab *s, int line, int stopline, int noerror)
+print_source_lines (struct symtab *s, int line, int stopline,
+ enum print_source_lines_flags flags)
{
- print_source_lines_base (s, line, stopline, noerror);
+ print_source_lines_base (s, line, stopline, flags);
}
\f
/* Print info on range of pc's in a specified line. */
diff --git a/gdb/symtab.h b/gdb/symtab.h
index 526fe5a..0f0edb3 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -1143,7 +1143,15 @@ extern void clear_solib (void);
extern int identify_source_line (struct symtab *, int, int, CORE_ADDR);
-extern void print_source_lines (struct symtab *, int, int, int);
+/* Flags passed as 4th argument to print_source_lines. */
+
+enum print_source_lines_flags {
+ /* Do not print an error message. */
+ PRINT_SOURCE_LINES_NOERROR = (1 << 0)
+};
+
+extern void print_source_lines (struct symtab *, int, int,
+ enum print_source_lines_flags);
extern void forget_cached_source_info_for_objfile (struct objfile *);
extern void forget_cached_source_info (void);
--
1.7.1
next prev parent reply other threads:[~2012-06-06 12:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-06 12:34 [PATCH 00/17] branch tracing support markus.t.metzger
2012-06-06 12:34 ` [PATCH 15/17] gdbserver, btrace: add generic btrace support markus.t.metzger
2012-06-06 12:34 ` [PATCH 07/17] configure: autoreconf markus.t.metzger
2012-06-06 12:34 ` [PATCH 08/17] linux, btrace: perf_event based branch tracing markus.t.metzger
2012-06-06 12:34 ` markus.t.metzger [this message]
2012-06-06 12:34 ` [PATCH 05/17] cli, btrace: add btrace cli markus.t.metzger
2012-06-06 12:34 ` [PATCH 14/17] remote, btrace: add branch trace remote ops markus.t.metzger
2012-06-06 12:34 ` [PATCH 09/17] btrace, linux: add linux native btrace target ops markus.t.metzger
2012-06-06 12:34 ` [PATCH 06/17] configure: add check for perf_event header markus.t.metzger
2012-06-06 12:34 ` [PATCH 11/17] test, btrace: add branch tracing tests markus.t.metzger
2012-06-06 12:34 ` [PATCH 16/17] gdbserver, linux, btrace: add btrace support for linux-low markus.t.metzger
2012-06-06 12:34 ` [PATCH 03/17] source, disasm: optionally prefix source lines with filename markus.t.metzger
2012-06-06 12:34 ` [PATCH 13/17] xml, btrace: define btrace xml document style markus.t.metzger
2012-06-06 12:34 ` [PATCH 10/17] btrace, config: enable btrace for 32bit and 64bit linux native markus.t.metzger
2012-06-06 12:34 ` [PATCH 04/17] thread, btrace: add generic branch trace support markus.t.metzger
2012-06-06 12:34 ` [PATCH 01/17] disas: add precise instructions flag markus.t.metzger
2012-06-06 12:34 ` [PATCH 12/17] test, configure: autoreconf markus.t.metzger
2012-06-06 12:36 ` [PATCH 17/17] test, btrace: more branch tracing tests markus.t.metzger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1338985955-28749-3-git-send-email-markus.t.metzger@intel.com \
--to=markus.t.metzger@intel.com \
--cc=gdb-patches@sourceware.org \
--cc=jan.kratochvil@redhat.com \
--cc=markus.t.metzger@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).