From patchwork Fri Aug 25 08:48:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 22354 Received: (qmail 125497 invoked by alias); 25 Aug 2017 08:53:43 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 18226 invoked by uid 89); 25 Aug 2017 08:49:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy=th, 2327, 4337, H*MI:9905 X-HELO: sessmg22.ericsson.net Received: from sessmg22.ericsson.net (HELO sessmg22.ericsson.net) (193.180.251.58) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 25 Aug 2017 08:49:14 +0000 Received: from ESESSHC022.ericsson.se (Unknown_Domain [153.88.183.84]) by sessmg22.ericsson.net (Symantec Mail Security) with SMTP id 8A.E2.20899.874EF995; Fri, 25 Aug 2017 10:48:56 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.84) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 25 Aug 2017 10:48:55 +0200 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.ki.sw.ericsson.se (192.176.1.83) by AMSPR07MB312.eurprd07.prod.outlook.com (2a01:111:e400:802f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.4; Fri, 25 Aug 2017 08:48:54 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [pushed] gdbserver: Rename some functions, thread -> inferior Date: Fri, 25 Aug 2017 10:48:04 +0200 Message-ID: <1503650884-9905-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: VI1P194CA0005.EURP194.PROD.OUTLOOK.COM (2603:10a6:800:be::15) To AMSPR07MB312.eurprd07.prod.outlook.com (2a01:111:e400:802f::24) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 73bb1aa0-d0e7-4b3c-d72a-08d4eb961ddb X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:AMSPR07MB312; X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB312; 3:pieTTQ9uyQ61qbqIoV/+xSh/IsZfPGnr+pWkczOzc/bX9QXjKmSYBkdwrJ7lQvBUtlJvCAK6uOoEkw3iTisu3QlYuKA6xAbcRuofjNUfk3EXA65wLne+yRBILqbNVttvFbXzhjghvL684yOyYQya42CKXjHD3GvSF5Gf8LQyjQKHfYB1dms441YPKn8GbLRoiJIfLQYUOe6Eo83kXtgYlZlNOErsNemOO2yunMHzS/BaYQPwZEPsekivPj0RK0Td; 25:/KjWC+cvQ985DvYXZ+EWXTAJeu1L4PMUFKewqp+SwebZFlGpZkO8LKTPAV5FmEoc3PpUjIEArur8swpGRB0TJ8AxDBVVeXxJUM7DKk3ScefwswtQxh2JP1JrdKIg4k97yY+Tml4X0cEgr9jrQbXvJ4CxfsoEG/rEXMsoXDcZUFmyS+xs/RQL4uBwBjIaTu5pooHspZr41z8Uo5xiJmxpA8w6WtExdMd2mDMVpqjKmrLmUARUOiU1dTGZ4iHazgEdDV0kijuT+nRR4YKbT/siB0QAfoOPHj54pu5RW1Ipfu8QkX53Iov1PVMIa923lU1DeHBaodwk1iXFDc6CvvI9qg==; 31:1ZeFXZ3aKYh2pN0Avg5tXFeqxbeVc4zjQVW9pUF3ky5A3HLYkEa+ulOjPTJ6HwIZg2FNm9YmRXfEJxyfXLOzVV53Eei1Yq+feItmXjohZTA9UX6E032N9auKT3je1UbzkfODPIzHycq2l9K3P/IY7hGm7QRjdn1/IR0tl3mRWOfXPO64ZdVn6o/sTmPyHGMGuUlLRJb7z/ud4TLUH2liBxLWvvr3otMAXYFwllC9Z2U= X-MS-TrafficTypeDiagnostic: AMSPR07MB312: X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB312; 20:MOEw1DejiQxCLx1G8wEOBpP/QsJByHOgmWiOd3VqlE98FGvjOZDswto3i5s/k7RYqtM8Ru0cs0hsj1EdYZsoAC3DZZQqauZIhlMZUR1oshJiYbGShAHbZjNAeTVAev8qauoGmjonVzmkKofRisTE3Elmp9sQ8NwNKRQVzFDhltKuyljyq5JhMKD5PKiwHj+okjK2ZuePVWYTegZQLgBjokIsz2f99a09eLThi2OG6EZ3/e/JTcclF/cF9otpkgIIl7vtc7W9rJ9V1ipCg3/6OVuMgl3T0s4t8urRU2p44IQRL6dkK3314AB50WKXjRKdZ2wW20bCTC2YTWLeDQBsXzXAhp5yoY+QNgAZ300AcQIyG63eGHJONSQVkcKpCiVxdSOK/TSu8xIoBYz9HkXu/zXQfTtOTBgJiptq7Ho3UTqO+MA7LxFQbY4f2DureIV9h8IyAQ9/31VuKYdXu/BBJQ8B29HxEsexr5Y05rsa4C4OLHlgjCZrt+Vb8zuvoWC6; 4:c0+HhODs+4YLhSe/8HXiFsrHg34JNLoCAqfhpoJlQNAcWliDBD8pjqspLrk7GJtr/1+YE7S+bPt6WPGd88lhUKJj1gRBwvhbSRA42qUikh2AQVExrf32oj6SoJe5T2M0bE4NzZ5vj/tBUzzfsBvLWipj+MNedkFKslPgYyxwTMWMXrbVDpBQ0QVms0i8b9UkSx5+3N5VI+1CdNz8J53Mqswl9ewlUZ4xe3HYoJGBvCHXZmO7tU21qaNGF/AlioP6zVfPuuFETiqsgTh5vb3MMztKIw+tce2akrkf0QP7L98= X-Exchange-Antispam-Report-Test: UriScan:(37575265505322); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(3002001)(6041248)(20161123555025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123562025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AMSPR07MB312; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AMSPR07MB312; X-Forefront-PRVS: 041032FF37 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(7370300001)(6009001)(39860400002)(189002)(377424004)(199003)(54534003)(2361001)(33646002)(107886003)(2351001)(2906002)(47776003)(6116002)(48376002)(3846002)(5660300001)(110136004)(42186005)(6916009)(53936002)(81156014)(68736007)(7350300001)(101416001)(81166006)(36756003)(5003940100001)(25786009)(50226002)(6506006)(7736002)(4326008)(6486002)(97736004)(86362001)(189998001)(50986999)(6512007)(6666003)(305945005)(478600001)(8676002)(105586002)(66066001)(106356001)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:AMSPR07MB312; H:elxacz23q12.ki.sw.ericsson.se; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AMSPR07MB312; 23:9nbQPfajhjcVcNgB9mBVDJKi1Bp+EfpvBcC7+mMdc+?= =?us-ascii?Q?jP5YmcA/dj9SmIas+vwihMfmeAYK0QacTn7OsS4y90UoQsVr8gbwflcdrvIc?= =?us-ascii?Q?dPg2+6x4YBzIIODr9gqX7TA2DTw6Doi/SUOhtfJ4yL9iDduEziscUC2bTWqm?= =?us-ascii?Q?5SFwwhTO2VIH1C2n6+VIU1SNkUzJH024vpOhEl7o6Y7oUNmCnMpnCcGHacvb?= =?us-ascii?Q?gbDlpeZUU4YlZeQxE/UWElxYjrWHQpw0/7gqXyHS2CYl2cghAIz4YTmCvFLf?= =?us-ascii?Q?D9GYDLgYfN/YmwQ/XbXn8NzhtISd2QlhcGURc1RnruPdCllUtuQDdwLPaf4/?= =?us-ascii?Q?rXwBUBy9EK8omK/k3f9sG7hEybUe3mmEdDdGzjUedLZaBaM9wnKAuNccSxzr?= =?us-ascii?Q?s5ZuzaOZgoiAQas8k2Z+Qn4ql6wEXBlBlNd6n2pkZfrWeOq5PSReuz2rW9TL?= =?us-ascii?Q?DbrclhD49sbUykPB18SI4VjLPb3LLcPUaUl2pLVsSbaGsPJJJuLHN+qySnBW?= =?us-ascii?Q?bZV2rqnnF166HOz2cO+5D36ujGv8mJJXy6vwH/MQxSATWG9JyJtesoCH0AQP?= =?us-ascii?Q?V3kljuUXakVu2qqGGtZ95qFYlfCBXcM/MFO/LIlJp+YiWVPE4EROfQOMlmT7?= =?us-ascii?Q?IJuJ1oBDb+mYF9cX8vWttX9Z2If1K5ip9TIjYBtiu6tvJOhaEWni1cWLkZxw?= =?us-ascii?Q?36d0UhmN5Ql/GRJyBu1UyOt6T3Jo1PCoAaDiSdAs8dxUpCnSuXQmMseNCAmC?= =?us-ascii?Q?GkJaiIebymWxp6lwL9ju0HRTqHOERmQsLNLeM6YdNU4tg4TBubdaVpBgffE8?= =?us-ascii?Q?RoBxiOjJraug3bmv+24vZyyAhFrlb/lXcb0H9s5B5yXz0snXg6SETe0aNIVW?= =?us-ascii?Q?hvKwfEG/DHUkp22t+NwSPhptKFdk38RB1CTABNoOPbvcYfvrW3OP3Fij86ka?= =?us-ascii?Q?50MLzGi+yOgQxpc11efSviOlgJ50yNHJHngy65Nu2rY1etVRojIPIkShGyUd?= =?us-ascii?Q?DsFXVZNLZkhFQXgrLsAmKMUwC5cdQYJsvLNf8Tg1VnriOD/YBV6inzqk1K4F?= =?us-ascii?Q?uopBtjBYQi30LuB4l8DEtbCVN93/lsvPxl/XiJnAmaIQvgUSbZmWMJqxrdF5?= =?us-ascii?Q?fVHd/Jiti2KpGL9M9Fi4d05vkUf+VtaGeOe+m0AfcOTZSSWF197Q=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB312; 6:gCKCczPEx2xqUoZoJfghI7iPyMFLg98QvNEsJXvoTw0ErAdhiy+KLGENqYRZPvj7p0bu0l/0TwT1TPMVmJxa0ETAJfJ1+GjpZ4WiZxEm/SiRUngDISw95GOKoeQK2u0OuhCdc6sEtqiUo3hHjgq0rjduFZ/0vO0lqyqj5Rq/JiIuV14x5t8Hhj1lJVyzo6tfqtYLfPWFOc3oAGmIEB/DW2vk02L3Cq+dzeqb2Map+Qcml1imH2vG/5zZuvuNl3j147AmZPj3OfRUWahWyxj3YDvNeupmRlXmgpojrLKtWlcVC9aalzVPNOXwYtxBadzfpb2SmhXbZai30vHOV5WanQ==; 5:1OaxjP3ioLw80hXI+XO6UmVY9NPcd3YSxdAqVKMfKWY9YOYpDrXW5RuXkmTffuQckCEiNCmJRWzbUAgAmw2nyHxPMzKarn9rqVh1/jKKuBmGN5QMhEAEt6WAUrD9Id+oiLhxKF94xz7y1YpMAve5LA==; 24:X37kY5fvBL1UyuJw1c0YNoRiFGUtfMnjHguINYlqdf9L0PD8Kau2DTxW7+aG9kUjFkmtBi3aOmGltMaKuL8GYrOiaxnetQRxi1kblk/RhLY=; 7:QhevsLB4SJUucsh94ExcTOOYpqDp69VgJ/mfg2yky3UkWX0Abw+ielmWNZVvzs7/fvbFtNVuTK15qJl6WpSkseYytVRjfpPNOiopKfkBjKBMcW6p86OFWO1d8mg5x8v8EFSAOby0G2DKGBnB4DCXFZvcTHMwDz0DnC++GipYXCCvjOmmz1Rabb0AopqtWs3LukxRgYKLudQR8METe6trQ55yQo1aTJJQBNBAQ5vRdJo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2017 08:48:54.2307 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMSPR07MB312 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes These functions apply to thread, and not inferiors (in the gdbserver sense, the abstraction for threads and processes, as in inferior_list). Therefore, it would make more sense if these functions were named with "thread" rather than "inferior". gdb/gdbserver/ChangeLog: * inferiors.h (inferior_target_data): Rename to ... (thread_target_data): ... this. (inferior_regcache_data): Rename to ... (thread_regcache_data): ... this. (set_inferior_regcache_data): Rename to ... (set_thread_regcache_data): ... this. * inferiors.c (inferior_target_data): Rename to ... (thread_target_data): ... this. (inferior_regcache_data): Rename to ... (thread_regcache_data): ... this. (set_inferior_regcache_data): Rename to ... (set_thread_regcache_data): ... this. (free_one_thread): Update. * linux-low.h (get_thread_lwp): Update. * regcache.c (get_thread_regcache): Update. (regcache_invalidate_thread): Update. (free_register_cache_thread): Update. * win32-i386-low.c (update_debug_registers_callback): Update. (win32_get_current_dr): Update. * win32-low.c (thread_rec): Update. (delete_thread_info): Update. (continue_one_thread): Update. (suspend_one_thread): Update. --- gdb/gdbserver/ChangeLog | 26 ++++++++++++++++++++++++++ gdb/gdbserver/inferiors.c | 14 +++++++------- gdb/gdbserver/inferiors.h | 6 +++--- gdb/gdbserver/linux-low.h | 2 +- gdb/gdbserver/regcache.c | 10 +++++----- gdb/gdbserver/win32-i386-low.c | 4 ++-- gdb/gdbserver/win32-low.c | 8 ++++---- 7 files changed, 48 insertions(+), 22 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 0bf9610..117ba5f 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,29 @@ +2017-08-25 Simon Marchi + + * inferiors.h (inferior_target_data): Rename to ... + (thread_target_data): ... this. + (inferior_regcache_data): Rename to ... + (thread_regcache_data): ... this. + (set_inferior_regcache_data): Rename to ... + (set_thread_regcache_data): ... this. + * inferiors.c (inferior_target_data): Rename to ... + (thread_target_data): ... this. + (inferior_regcache_data): Rename to ... + (thread_regcache_data): ... this. + (set_inferior_regcache_data): Rename to ... + (set_thread_regcache_data): ... this. + (free_one_thread): Update. + * linux-low.h (get_thread_lwp): Update. + * regcache.c (get_thread_regcache): Update. + (regcache_invalidate_thread): Update. + (free_register_cache_thread): Update. + * win32-i386-low.c (update_debug_registers_callback): Update. + (win32_get_current_dr): Update. + * win32-low.c (thread_rec): Update. + (delete_thread_info): Update. + (continue_one_thread): Update. + (suspend_one_thread): Update. + 2017-08-24 Simon Marchi * inferiors.c (set_inferior_target_data): Remove. diff --git a/gdb/gdbserver/inferiors.c b/gdb/gdbserver/inferiors.c index 8a2e5d2..3c171a1 100644 --- a/gdb/gdbserver/inferiors.c +++ b/gdb/gdbserver/inferiors.c @@ -197,7 +197,7 @@ static void free_one_thread (struct inferior_list_entry *inf) { struct thread_info *thread = get_thread (inf); - free_register_cache (inferior_regcache_data (thread)); + free_register_cache (thread_regcache_data (thread)); free (thread); } @@ -309,21 +309,21 @@ find_inferior_id (struct inferior_list *list, ptid_t id) } void * -inferior_target_data (struct thread_info *inferior) +thread_target_data (struct thread_info *thread) { - return inferior->target_data; + return thread->target_data; } struct regcache * -inferior_regcache_data (struct thread_info *inferior) +thread_regcache_data (struct thread_info *thread) { - return inferior->regcache_data; + return thread->regcache_data; } void -set_inferior_regcache_data (struct thread_info *inferior, struct regcache *data) +set_thread_regcache_data (struct thread_info *thread, struct regcache *data) { - inferior->regcache_data = data; + thread->regcache_data = data; } /* Return true if LIST has exactly one entry. */ diff --git a/gdb/gdbserver/inferiors.h b/gdb/gdbserver/inferiors.h index be248b0..f229e67 100644 --- a/gdb/gdbserver/inferiors.h +++ b/gdb/gdbserver/inferiors.h @@ -160,8 +160,8 @@ struct inferior_list_entry * void *), void *arg); -void *inferior_target_data (struct thread_info *); -struct regcache *inferior_regcache_data (struct thread_info *); -void set_inferior_regcache_data (struct thread_info *, struct regcache *); +void *thread_target_data (struct thread_info *); +struct regcache *thread_regcache_data (struct thread_info *); +void set_thread_regcache_data (struct thread_info *, struct regcache *); #endif /* INFERIORS_H */ diff --git a/gdb/gdbserver/linux-low.h b/gdb/gdbserver/linux-low.h index 2bf7e7c..9106144 100644 --- a/gdb/gdbserver/linux-low.h +++ b/gdb/gdbserver/linux-low.h @@ -252,7 +252,7 @@ struct linux_target_ops extern struct linux_target_ops the_low_target; -#define get_thread_lwp(thr) ((struct lwp_info *) (inferior_target_data (thr))) +#define get_thread_lwp(thr) ((struct lwp_info *) (thread_target_data (thr))) #define get_lwp_thread(lwp) ((lwp)->thread) /* This struct is recorded in the target_data field of struct thread_info. diff --git a/gdb/gdbserver/regcache.c b/gdb/gdbserver/regcache.c index 0f16f60..9b837e7 100644 --- a/gdb/gdbserver/regcache.c +++ b/gdb/gdbserver/regcache.c @@ -28,7 +28,7 @@ get_thread_regcache (struct thread_info *thread, int fetch) { struct regcache *regcache; - regcache = inferior_regcache_data (thread); + regcache = thread_regcache_data (thread); /* Threads' regcaches are created lazily, because biarch targets add the main thread/lwp before seeing it stop for the first time, and @@ -44,7 +44,7 @@ get_thread_regcache (struct thread_info *thread, int fetch) gdb_assert (proc->tdesc != NULL); regcache = new_register_cache (proc->tdesc); - set_inferior_regcache_data (thread, regcache); + set_thread_regcache_data (thread, regcache); } if (fetch && regcache->registers_valid == 0) @@ -76,7 +76,7 @@ regcache_invalidate_thread (struct thread_info *thread) { struct regcache *regcache; - regcache = inferior_regcache_data (thread); + regcache = thread_regcache_data (thread); if (regcache == NULL) return; @@ -277,13 +277,13 @@ find_register_by_number (const struct target_desc *tdesc, int n) static void free_register_cache_thread (struct thread_info *thread) { - struct regcache *regcache = inferior_regcache_data (thread); + struct regcache *regcache = thread_regcache_data (thread); if (regcache != NULL) { regcache_invalidate_thread (thread); free_register_cache (regcache); - set_inferior_regcache_data (thread, NULL); + set_thread_regcache_data (thread, NULL); } } diff --git a/gdb/gdbserver/win32-i386-low.c b/gdb/gdbserver/win32-i386-low.c index c505190..40bdf12 100644 --- a/gdb/gdbserver/win32-i386-low.c +++ b/gdb/gdbserver/win32-i386-low.c @@ -45,7 +45,7 @@ update_debug_registers_callback (struct inferior_list_entry *entry, void *pid_p) { struct thread_info *thr = (struct thread_info *) entry; - win32_thread_info *th = (win32_thread_info *) inferior_target_data (thr); + win32_thread_info *th = (win32_thread_info *) thread_target_data (thr); int pid = *(int *) pid_p; /* Only update the threads of this process. */ @@ -90,7 +90,7 @@ static DWORD64 win32_get_current_dr (int dr) { win32_thread_info *th - = (win32_thread_info *) inferior_target_data (current_thread); + = (win32_thread_info *) thread_target_data (current_thread); win32_require_context (th); diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c index 88f6911..cc84d15 100644 --- a/gdb/gdbserver/win32-low.c +++ b/gdb/gdbserver/win32-low.c @@ -198,7 +198,7 @@ thread_rec (ptid_t ptid, int get_context) if (thread == NULL) return NULL; - th = (win32_thread_info *) inferior_target_data (thread); + th = (win32_thread_info *) thread_target_data (thread); if (get_context) win32_require_context (th); return th; @@ -232,7 +232,7 @@ static void delete_thread_info (struct inferior_list_entry *entry) { struct thread_info *thread = (struct thread_info *) entry; - win32_thread_info *th = (win32_thread_info *) inferior_target_data (thread); + win32_thread_info *th = (win32_thread_info *) thread_target_data (thread); remove_thread (thread); CloseHandle (th->h); @@ -433,7 +433,7 @@ continue_one_thread (struct inferior_list_entry *this_thread, void *id_ptr) { struct thread_info *thread = (struct thread_info *) this_thread; int thread_id = * (int *) id_ptr; - win32_thread_info *th = (win32_thread_info *) inferior_target_data (thread); + win32_thread_info *th = (win32_thread_info *) thread_target_data (thread); if (thread_id == -1 || thread_id == th->tid) { @@ -1333,7 +1333,7 @@ static void suspend_one_thread (struct inferior_list_entry *entry) { struct thread_info *thread = (struct thread_info *) entry; - win32_thread_info *th = (win32_thread_info *) inferior_target_data (thread); + win32_thread_info *th = (win32_thread_info *) thread_target_data (thread); if (!th->suspended) {