From 44e89118cb33b71a1eaf6514ea2b686aac1974dd Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 11 Jul 2014 09:39:12 -0600 Subject: [PATCH] fix calls to find_target_beneath A long time ago Pedro pointed out that there are some calls to find_target_beneath that pass in an explicit target_ops; but which should instead use the ops provided to the method in question. See: https://sourceware.org/ml/gdb-patches/2014-01/msg00429.html This patch is just a minor cleanup to fix all such calls. There were only three. 2014-07-18 Tom Tromey * spu-multiarch.c (spu_region_ok_for_hw_watchpoint): Pass "self" to find_target_beneath. * ravenscar-thread.c (ravenscar_prepare_to_store): Pass "ops" to find_target_beneath. (ravenscar_mourn_inferior): Pass "self" to find_target_beneath. --- gdb/ChangeLog | 8 ++++++++ gdb/ravenscar-thread.c | 4 ++-- gdb/spu-multiarch.c | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f29d399a7d6..d0536af53dc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2014-07-18 Tom Tromey + + * spu-multiarch.c (spu_region_ok_for_hw_watchpoint): Pass "self" + to find_target_beneath. + * ravenscar-thread.c (ravenscar_prepare_to_store): Pass "ops" to + find_target_beneath. + (ravenscar_mourn_inferior): Pass "self" to find_target_beneath. + 2014-07-18 Tom Tromey PR gdb/17130: diff --git a/gdb/ravenscar-thread.c b/gdb/ravenscar-thread.c index 060d5ce4cc7..c4a01a55abc 100644 --- a/gdb/ravenscar-thread.c +++ b/gdb/ravenscar-thread.c @@ -308,7 +308,7 @@ static void ravenscar_prepare_to_store (struct target_ops *self, struct regcache *regcache) { - struct target_ops *beneath = find_target_beneath (&ravenscar_ops); + struct target_ops *beneath = find_target_beneath (self); if (!ravenscar_runtime_initialized () || ptid_equal (inferior_ptid, base_magic_null_ptid) @@ -327,7 +327,7 @@ ravenscar_prepare_to_store (struct target_ops *self, static void ravenscar_mourn_inferior (struct target_ops *ops) { - struct target_ops *beneath = find_target_beneath (&ravenscar_ops); + struct target_ops *beneath = find_target_beneath (ops); base_ptid = null_ptid; beneath->to_mourn_inferior (beneath); diff --git a/gdb/spu-multiarch.c b/gdb/spu-multiarch.c index a22cc1b44af..e3285d0235c 100644 --- a/gdb/spu-multiarch.c +++ b/gdb/spu-multiarch.c @@ -121,7 +121,7 @@ static int spu_region_ok_for_hw_watchpoint (struct target_ops *self, CORE_ADDR addr, int len) { - struct target_ops *ops_beneath = find_target_beneath (&spu_ops); + struct target_ops *ops_beneath = find_target_beneath (self); /* We cannot watch SPU local store. */ if (SPUADDR_SPU (addr) != -1) -- 2.30.2