projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce metadata style
[deliverable/binutils-gdb.git]
/
gdb
/
break-catch-syscall.c
diff --git
a/gdb/break-catch-syscall.c
b/gdb/break-catch-syscall.c
index 33018ec99c2450c322af40f7743232c3b67c070f..dde80b54a2fb98e946381250591368b3d99ce54b 100644
(file)
--- a/
gdb/break-catch-syscall.c
+++ b/
gdb/break-catch-syscall.c
@@
-29,6
+29,7
@@
#include "arch-utils.h"
#include "observable.h"
#include "xml-syscall.h"
#include "arch-utils.h"
#include "observable.h"
#include "xml-syscall.h"
+#include "cli/cli-style.h"
/* An instance of this type is used to represent a syscall catchpoint.
A breakpoint is really of this type iff its ops pointer points to
/* An instance of this type is used to represent a syscall catchpoint.
A breakpoint is really of this type iff its ops pointer points to
@@
-42,8
+43,6
@@
struct syscall_catchpoint : public breakpoint
std::vector<int> syscalls_to_be_caught;
};
std::vector<int> syscalls_to_be_caught;
};
-static const struct inferior_data *catch_syscall_inferior_data = NULL;
-
struct catch_syscall_inferior_data
{
/* We keep a count of the number of times the user has requested a
struct catch_syscall_inferior_data
{
/* We keep a count of the number of times the user has requested a
@@
-61,31
+60,21
@@
struct catch_syscall_inferior_data
int total_syscalls_count;
};
int total_syscalls_count;
};
+static const struct inferior_key<struct catch_syscall_inferior_data>
+ catch_syscall_inferior_data;
+
static struct catch_syscall_inferior_data *
get_catch_syscall_inferior_data (struct inferior *inf)
{
struct catch_syscall_inferior_data *inf_data;
static struct catch_syscall_inferior_data *
get_catch_syscall_inferior_data (struct inferior *inf)
{
struct catch_syscall_inferior_data *inf_data;
- inf_data = ((struct catch_syscall_inferior_data *)
- inferior_data (inf, catch_syscall_inferior_data));
+ inf_data = catch_syscall_inferior_data.get (inf);
if (inf_data == NULL)
if (inf_data == NULL)
- {
- inf_data = new struct catch_syscall_inferior_data ();
- set_inferior_data (inf, catch_syscall_inferior_data, inf_data);
- }
+ inf_data = catch_syscall_inferior_data.emplace (inf);
return inf_data;
}
return inf_data;
}
-static void
-catch_syscall_inferior_data_cleanup (struct inferior *inf, void *arg)
-{
- struct catch_syscall_inferior_data *inf_data
- = (struct catch_syscall_inferior_data *) arg;
- delete inf_data;
-}
-
-
/* Implement the "insert" breakpoint_ops method for syscall
catchpoints. */
/* Implement the "insert" breakpoint_ops method for syscall
catchpoints. */
@@
-217,7
+206,7
@@
print_it_catch_syscall (bpstat bs)
: EXEC_ASYNC_SYSCALL_RETURN));
uiout->field_string ("disp", bpdisp_text (b->disposition));
}
: EXEC_ASYNC_SYSCALL_RETURN));
uiout->field_string ("disp", bpdisp_text (b->disposition));
}
- uiout->field_
int
("bkptno", b->number);
+ uiout->field_
signed
("bkptno", b->number);
if (last.kind == TARGET_WAITKIND_SYSCALL_ENTRY)
uiout->text (" (call to syscall ");
if (last.kind == TARGET_WAITKIND_SYSCALL_ENTRY)
uiout->text (" (call to syscall ");
@@
-225,7
+214,7
@@
print_it_catch_syscall (bpstat bs)
uiout->text (" (returned from syscall ");
if (s.name == NULL || uiout->is_mi_like_p ())
uiout->text (" (returned from syscall ");
if (s.name == NULL || uiout->is_mi_like_p ())
- uiout->field_
int
("syscall-number", last.value.syscall_number);
+ uiout->field_
signed
("syscall-number", last.value.syscall_number);
if (s.name != NULL)
uiout->field_string ("syscall-name", s.name);
if (s.name != NULL)
uiout->field_string ("syscall-name", s.name);
@@
-265,7
+254,7
@@
print_one_catch_syscall (struct breakpoint *b,
for (int iter : c->syscalls_to_be_caught)
{
for (int iter : c->syscalls_to_be_caught)
{
- char *
x
= text;
+ char *
previous_text
= text;
struct syscall s;
get_syscall_by_number (gdbarch, iter, &s);
struct syscall s;
get_syscall_by_number (gdbarch, iter, &s);
@@
-274,17
+263,18
@@
print_one_catch_syscall (struct breakpoint *b,
else
text = xstrprintf ("%s%d, ", text, iter);
else
text = xstrprintf ("%s%d, ", text, iter);
- /* We have to xfree the last 'text' (now stored at 'x')
- because xstrprintf dynamically allocates new space for it
- on every call. */
- xfree (x);
+ /* We have to xfree previous_text because xstrprintf dynamically
+ allocates new space for text on every call. */
+ xfree (previous_text);
}
/* Remove the last comma. */
text[strlen (text) - 2] = '\0';
uiout->field_string ("what", text);
}
/* Remove the last comma. */
text[strlen (text) - 2] = '\0';
uiout->field_string ("what", text);
+ /* xfree last text. */
+ xfree (text);
}
else
}
else
- uiout->field_string ("what", "<any syscall>");
+ uiout->field_string ("what", "<any syscall>"
, metadata_style.style ()
);
uiout->text ("\" ");
if (uiout->is_mi_like_p ())
uiout->text ("\" ");
if (uiout->is_mi_like_p ())
@@
-616,9
+606,6
@@
_initialize_break_catch_syscall (void)
initialize_syscall_catchpoint_ops ();
gdb::observers::inferior_exit.attach (clear_syscall_counts);
initialize_syscall_catchpoint_ops ();
gdb::observers::inferior_exit.attach (clear_syscall_counts);
- catch_syscall_inferior_data
- = register_inferior_data_with_cleanup (NULL,
- catch_syscall_inferior_data_cleanup);
add_catch_command ("syscall", _("\
Catch system calls by their names, groups and/or numbers.\n\
add_catch_command ("syscall", _("\
Catch system calls by their names, groups and/or numbers.\n\
This page took
0.025006 seconds
and
4
git commands to generate.