diff options
| -rw-r--r-- | gdb/ChangeLog | 22 | ||||
| -rw-r--r-- | gdb/aix-thread.c | 2 | ||||
| -rw-r--r-- | gdb/darwin-nat.c | 2 | ||||
| -rw-r--r-- | gdb/dec-thread.c | 5 | ||||
| -rw-r--r-- | gdb/inf-ttrace.c | 2 | ||||
| -rw-r--r-- | gdb/linux-thread-db.c | 2 | ||||
| -rw-r--r-- | gdb/ravenscar-thread.c | 2 | ||||
| -rw-r--r-- | gdb/remote.c | 2 | ||||
| -rw-r--r-- | gdb/sol-thread.c | 2 | ||||
| -rw-r--r-- | gdb/target.c | 4 | ||||
| -rw-r--r-- | gdb/target.h | 5 | ||||
| -rw-r--r-- | gdb/windows-nat.c | 2 |
12 files changed, 38 insertions, 14 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b9edea7346b..cfa06ee20de 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,27 @@ 2014-02-19 Tom Tromey <tromey@redhat.com> + * windows-nat.c (windows_get_ada_task_ptid): Add 'self' argument. + * target.h (struct target_ops) <to_get_ada_task_ptid>: Add + argument. + (target_get_ada_task_ptid): Add argument. + * target.c (update_current_target): Update. + (default_get_ada_task_ptid): Add 'self' argument. + * sol-thread.c (sol_get_ada_task_ptid): Add 'self' argument. + * remote.c (remote_get_ada_task_ptid): Add 'self' argument. + * ravenscar-thread.c (ravenscar_get_ada_task_ptid): Add 'self' + argument. + * linux-thread-db.c (thread_db_get_ada_task_ptid): Add 'self' + argument. + * inf-ttrace.c (inf_ttrace_get_ada_task_ptid): Add 'self' + argument. + * dec-thread.c (dec_thread_get_ada_task_ptid): Add 'self' + argument. + * darwin-nat.c (darwin_get_ada_task_ptid): Add 'self' argument. + * aix-thread.c (aix_thread_get_ada_task_ptid): Add 'self' + argument. + +2014-02-19 Tom Tromey <tromey@redhat.com> + * target.h (struct target_ops) <to_goto_bookmark>: Add argument. (target_goto_bookmark): Add argument. * target.c (dummy_goto_bookmark): Add 'self' argument. diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c index d0ad9151b79..c01a7c56907 100644 --- a/gdb/aix-thread.c +++ b/gdb/aix-thread.c @@ -1806,7 +1806,7 @@ aix_thread_extra_thread_info (struct target_ops *self, } static ptid_t -aix_thread_get_ada_task_ptid (long lwp, long thread) +aix_thread_get_ada_task_ptid (struct target_ops *self, long lwp, long thread) { return ptid_build (ptid_get_pid (inferior_ptid), 0, thread); } diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c index 6cbfc832430..dd44bdb6eed 100644 --- a/gdb/darwin-nat.c +++ b/gdb/darwin-nat.c @@ -2005,7 +2005,7 @@ darwin_pid_to_exec_file (struct target_ops *self, int pid) } static ptid_t -darwin_get_ada_task_ptid (long lwp, long thread) +darwin_get_ada_task_ptid (struct target_ops *self, long lwp, long thread) { int i; darwin_thread_t *t; diff --git a/gdb/dec-thread.c b/gdb/dec-thread.c index b9a1c68a190..e7cecc4ea30 100644 --- a/gdb/dec-thread.c +++ b/gdb/dec-thread.c @@ -687,12 +687,13 @@ dec_thread_new_objfile_observer (struct objfile *objfile) /* The "to_get_ada_task_ptid" method of the dec_thread_ops. */ static ptid_t -dec_thread_get_ada_task_ptid (long lwp, long thread) +dec_thread_get_ada_task_ptid (struct target_ops *self, long lwp, long thread) { int i; struct dec_thread_info *info; - debug ("dec_thread_get_ada_task_ptid (lwp=0x%lx, thread=0x%lx)", + debug ("dec_thread_get_ada_task_ptid (struct target_ops *self, + lwp=0x%lx, thread=0x%lx)", lwp, thread); for (i = 0; VEC_iterate (dec_thread_info_s, dec_thread_list, i, info); diff --git a/gdb/inf-ttrace.c b/gdb/inf-ttrace.c index 5e64d8d6432..802dc85dd12 100644 --- a/gdb/inf-ttrace.c +++ b/gdb/inf-ttrace.c @@ -1314,7 +1314,7 @@ inf_ttrace_pid_to_str (struct target_ops *ops, ptid_t ptid) /* Implement the get_ada_task_ptid target_ops method. */ static ptid_t -inf_ttrace_get_ada_task_ptid (long lwp, long thread) +inf_ttrace_get_ada_task_ptid (struct target_ops *self, long lwp, long thread) { return ptid_build (ptid_get_pid (inferior_ptid), lwp, 0); } diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c index 9180464b9d0..cf7adc42bff 100644 --- a/gdb/linux-thread-db.c +++ b/gdb/linux-thread-db.c @@ -1875,7 +1875,7 @@ thread_db_find_thread_from_tid (struct thread_info *thread, void *data) /* Implement the to_get_ada_task_ptid target method for this target. */ static ptid_t -thread_db_get_ada_task_ptid (long lwp, long thread) +thread_db_get_ada_task_ptid (struct target_ops *self, long lwp, long thread) { struct thread_info *thread_info; diff --git a/gdb/ravenscar-thread.c b/gdb/ravenscar-thread.c index cf548e763c5..fdec52a8e56 100644 --- a/gdb/ravenscar-thread.c +++ b/gdb/ravenscar-thread.c @@ -350,7 +350,7 @@ ravenscar_inferior_created (struct target_ops *target, int from_tty) } static ptid_t -ravenscar_get_ada_task_ptid (long lwp, long thread) +ravenscar_get_ada_task_ptid (struct target_ops *self, long lwp, long thread) { return ptid_build (ptid_get_pid (base_ptid), 0, thread); } diff --git a/gdb/remote.c b/gdb/remote.c index d2a4d52aa8a..2b499a391a9 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -2969,7 +2969,7 @@ remote_static_tracepoint_markers_by_strid (const char *strid) /* Implement the to_get_ada_task_ptid function for the remote targets. */ static ptid_t -remote_get_ada_task_ptid (long lwp, long thread) +remote_get_ada_task_ptid (struct target_ops *self, long lwp, long thread) { return ptid_build (ptid_get_pid (inferior_ptid), 0, lwp); } diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c index 67e082541bb..56d023bc6a7 100644 --- a/gdb/sol-thread.c +++ b/gdb/sol-thread.c @@ -1190,7 +1190,7 @@ thread_db_find_thread_from_tid (struct thread_info *thread, void *data) } static ptid_t -sol_get_ada_task_ptid (long lwp, long thread) +sol_get_ada_task_ptid (struct target_ops *self, long lwp, long thread) { struct thread_info *thread_info = iterate_over_threads (thread_db_find_thread_from_tid, &thread); diff --git a/gdb/target.c b/gdb/target.c index 4d67bc37ffb..0a51ccd6c55 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -537,7 +537,7 @@ default_terminal_info (struct target_ops *self, const char *args, int from_tty) inferior_ptid. */ static ptid_t -default_get_ada_task_ptid (long lwp, long tid) +default_get_ada_task_ptid (struct target_ops *self, long lwp, long tid) { return ptid_build (ptid_get_pid (inferior_ptid), lwp, tid); } @@ -837,7 +837,7 @@ update_current_target (void) default_thread_architecture); current_target.to_read_description = NULL; de_fault (to_get_ada_task_ptid, - (ptid_t (*) (long, long)) + (ptid_t (*) (struct target_ops *, long, long)) default_get_ada_task_ptid); de_fault (to_supports_multi_process, (int (*) (void)) diff --git a/gdb/target.h b/gdb/target.h index 526ba521d5d..723868e60ac 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -641,7 +641,8 @@ struct target_ops based on LWP and THREAD. These values are extracted from the task Private_Data section of the Ada Task Control Block, and their interpretation depends on the target. */ - ptid_t (*to_get_ada_task_ptid) (long lwp, long thread); + ptid_t (*to_get_ada_task_ptid) (struct target_ops *, + long lwp, long thread); /* Read one auxv entry from *READPTR, not reading locations >= ENDPTR. Return 0 if *READPTR is already at the end of the buffer. @@ -1702,7 +1703,7 @@ extern int target_masked_watch_num_registers (CORE_ADDR addr, CORE_ADDR mask); extern const struct target_desc *target_read_description (struct target_ops *); #define target_get_ada_task_ptid(lwp, tid) \ - (*current_target.to_get_ada_task_ptid) (lwp,tid) + (*current_target.to_get_ada_task_ptid) (¤t_target, lwp,tid) /* Utility implementation of searching memory. */ extern int simple_search_memory (struct target_ops* ops, diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index bc00c43c002..164b53f6fee 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -2585,7 +2585,7 @@ windows_get_tib_address (ptid_t ptid, CORE_ADDR *addr) } static ptid_t -windows_get_ada_task_ptid (long lwp, long thread) +windows_get_ada_task_ptid (struct target_ops *self, long lwp, long thread) { return ptid_build (ptid_get_pid (inferior_ptid), 0, lwp); } |