X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fbreak-catch-syscall.c;h=7e98a293900eb7ac05c23211ec2eec9c9e999e5f;hb=fdd67a422f898e5b0c80ccc1121af438328a9b1a;hp=dd7b37997b4519c8a323fc39ab450d711942d852;hpb=9a93831ccc0ba3ba447552069f230e6d93dcbf3f;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/break-catch-syscall.c b/gdb/break-catch-syscall.c index dd7b37997b..7e98a29390 100644 --- a/gdb/break-catch-syscall.c +++ b/gdb/break-catch-syscall.c @@ -1,6 +1,6 @@ /* Everything about syscall catchpoints, for GDB. - Copyright (C) 2009-2017 Free Software Foundation, Inc. + Copyright (C) 2009-2020 Free Software Foundation, Inc. This file is part of GDB. @@ -27,8 +27,9 @@ #include "mi/mi-common.h" #include "valprint.h" #include "arch-utils.h" -#include "observer.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 @@ -42,8 +43,6 @@ struct syscall_catchpoint : public breakpoint std::vector 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 @@ -61,31 +60,21 @@ struct catch_syscall_inferior_data int total_syscalls_count; }; +static const struct inferior_key + 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; - 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) - { - 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; } -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. */ @@ -110,11 +99,10 @@ insert_catch_syscall (struct bp_location *bl) } } - return target_set_syscall_catchpoint (ptid_get_pid (inferior_ptid), + return target_set_syscall_catchpoint (inferior_ptid.pid (), inf_data->total_syscalls_count != 0, inf_data->any_syscall_count, - inf_data->syscalls_counts.size (), - inf_data->syscalls_counts.data ()); + inf_data->syscalls_counts); } /* Implement the "remove" breakpoint_ops method for syscall @@ -142,11 +130,10 @@ remove_catch_syscall (struct bp_location *bl, enum remove_bp_reason reason) } } - return target_set_syscall_catchpoint (ptid_get_pid (inferior_ptid), + return target_set_syscall_catchpoint (inferior_ptid.pid (), inf_data->total_syscalls_count != 0, inf_data->any_syscall_count, - inf_data->syscalls_counts.size (), - inf_data->syscalls_counts.data ()); + inf_data->syscalls_counts); } /* Implement the "breakpoint_hit" breakpoint_ops method for syscall @@ -195,12 +182,11 @@ print_it_catch_syscall (bpstat bs) syscall is. It can be in the TARGET_WAITKIND_SYSCALL_ENTRY or TARGET_WAITKIND_SYSCALL_RETURN, and depending on it we must print "called syscall" or "returned from syscall". */ - ptid_t ptid; struct target_waitstatus last; struct syscall s; struct gdbarch *gdbarch = bs->bp_location_at->gdbarch; - get_last_target_status (&ptid, &last); + get_last_target_status (nullptr, nullptr, &last); get_syscall_by_number (gdbarch, last.value.syscall_number, &s); @@ -219,7 +205,7 @@ print_it_catch_syscall (bpstat bs) : 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 "); @@ -227,7 +213,7 @@ print_it_catch_syscall (bpstat bs) 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); @@ -267,7 +253,7 @@ print_one_catch_syscall (struct breakpoint *b, 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); @@ -276,17 +262,18 @@ print_one_catch_syscall (struct breakpoint *b, 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); + /* xfree last text. */ + xfree (text); } else - uiout->field_string ("what", ""); + uiout->field_string ("what", "", metadata_style.style ()); uiout->text ("\" "); if (uiout->is_mi_like_p ()) @@ -411,40 +398,23 @@ catch_syscall_split_args (const char *arg) { /* We have a syscall group. Let's expand it into a syscall list before inserting. */ - struct syscall *syscall_list; const char *group_name; /* Skip over "g:" and "group:" prefix strings. */ group_name = strchr (cur_name, ':') + 1; - syscall_list = get_syscalls_by_group (gdbarch, group_name); - - if (syscall_list == NULL) + if (!get_syscalls_by_group (gdbarch, group_name, &result)) error (_("Unknown syscall group '%s'."), group_name); - - for (i = 0; syscall_list[i].name != NULL; i++) - { - /* Insert each syscall that are part of the group. No - need to check if it is valid. */ - result.push_back (syscall_list[i].number); - } - - xfree (syscall_list); } else { - /* We have a name. Let's check if it's valid and convert it - to a number. */ - get_syscall_by_name (gdbarch, cur_name, &s); - - if (s.number == UNKNOWN_SYSCALL) + /* We have a name. Let's check if it's valid and fetch a + list of matching numbers. */ + if (!get_syscalls_by_name (gdbarch, cur_name, &result)) /* Here we have to issue an error instead of a warning, because GDB cannot do anything useful if there's no syscall number to be caught. */ error (_("Unknown syscall name '%s'."), cur_name); - - /* Ok, it's valid. */ - result.push_back (s.number); } } @@ -629,15 +599,13 @@ initialize_syscall_catchpoint_ops (void) ops->print_recreate = print_recreate_catch_syscall; } +void _initialize_break_catch_syscall (); void -_initialize_break_catch_syscall (void) +_initialize_break_catch_syscall () { initialize_syscall_catchpoint_ops (); - observer_attach_inferior_exit (clear_syscall_counts); - catch_syscall_inferior_data - = register_inferior_data_with_cleanup (NULL, - catch_syscall_inferior_data_cleanup); + gdb::observers::inferior_exit.attach (clear_syscall_counts); add_catch_command ("syscall", _("\ Catch system calls by their names, groups and/or numbers.\n\