From patchwork Fri Mar 22 19:04:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 87536 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8E7BD3858292 for ; Fri, 22 Mar 2024 19:05:15 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by sourceware.org (Postfix) with ESMTPS id ACCA5385840E for ; Fri, 22 Mar 2024 19:04:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ACCA5385840E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org ACCA5385840E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711134281; cv=none; b=PqDIcpltf6cStb9mxNXw87Zv0NQ6XpJDf2HVWcUDCOgwdC60v9BsAoUx9PjXJKy9YXzcP7zUQKOTvGY580rPxVXK2pyAl2f58DmsqTwwqHjElE8wxe/7C45OD3UzXDIT3Ww0gX7SVvKqzNkDAI1QXfdobri3+Iobw2lLLkRCa98= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711134281; c=relaxed/simple; bh=79F5DGLdThi5lbquVZyefE30Xic6J4p+8UDlgp0EB18=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=dXM5Z8vs095pdqp7nSJgPJjF5ubequFFkErtsSqXVgkDrFPV5A2HNx6sKk6VUpTEqAMNTZCFMfplmgmz3daF4UeKOb0xkyyP0ofmFRk6x3JveRKyRP9V5bmo6570aXvuYtRNgfC0PMT7mEECgkdklGZy4apCeW91uHldOtsggiQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-33e1d327595so1841849f8f.2 for ; Fri, 22 Mar 2024 12:04:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711134273; x=1711739073; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rSgkSkDJXzorJTJs1ZkvzfOd6Ygdg6RMgmc+ocxYzCM=; b=JFHPiTcF7t6hQ8roC95sMs56Xc3PVt8bDasen4mjwOfbJnxJfNqVYG6KVGEUCFEyiR 7heuInQznu4x/B4SSO9MBNkYXiyZ6kx/0Z5TjC6T4c4EXgMxLBa0acf47MRtkQtQYgG8 6j5noAgt/eSY0AGqw9JxDx56GziNBsK83Xj+22TRRvi1csBKNhBZy50ISDzjJxnfRQy0 bfyiP9SFasuQrwIu22SfeLWP9yLkSBA6zw1ClCHP5Y1QniSMaje8ZRZyZa3RPK0VAj2L bGtnEZpQiGjuUE/03r1KC8nFKyjPDvmDwtXaCgqmGc3V4C6EEeuWHEvDTGK0InPRghDY DInA== X-Gm-Message-State: AOJu0YzMR0gPtBRSqhZDf/N8Yp9tnsJrULzRxYo+3JV3QwkXFS+1xBL1 DDqlJcOeFilJPHQY3h+F1ZKsZq56ldaEc6Ao7xisZKFV0UuQdwkuh3WiWqmI X-Google-Smtp-Source: AGHT+IFHds5zWRwqvOakF5FxEwt5z2hbXsOISRvt/D5zvR3BkER//2aJB4gzmkJwBDJlN4Gd8Fga2Q== X-Received: by 2002:a05:6000:bd0:b0:33e:7fbd:5a1f with SMTP id dm16-20020a0560000bd000b0033e7fbd5a1fmr220671wrb.62.1711134273239; Fri, 22 Mar 2024 12:04:33 -0700 (PDT) Received: from localhost ([2001:8a0:f918:ab00:3ba9:feec:1922:9a68]) by smtp.gmail.com with UTF8SMTPSA id bp10-20020a5d5a8a000000b0033dedd63382sm2708444wrb.101.2024.03.22.12.04.32 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 22 Mar 2024 12:04:32 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 2/4] Simplify windows-nat.c:windows_make_so #ifdefery Date: Fri, 22 Mar 2024 19:04:22 +0000 Message-ID: <20240322190424.1231540-3-pedro@palves.net> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240322190424.1231540-1-pedro@palves.net> References: <20240322190424.1231540-1-pedro@palves.net> MIME-Version: 1.0 X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org There are two separate #ifndef __CYGWIN__/#else/#endif sections in the windows_make_so function with 3 lines of shared code separating them. I find this makes the code harder to understand than necessary. AFAICS, there is no reason those three shared lines need to be after the first #ifdef block. There is no early return, nor are 'load_addr' nor 'name' modified. This commit moves that shared code to the top of the function, and then combines the two #ifndef sections. Change-Id: If2678b52836b1c3134a5e9f9fdaee74448d8b7bc --- gdb/windows-nat.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index a90388922e2..a01011248c1 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -826,6 +826,10 @@ windows_nat_target::store_registers (struct regcache *regcache, int r) static windows_solib * windows_make_so (const char *name, LPVOID load_addr) { + windows_solib *so = &windows_process.solibs.emplace_back (); + so->load_addr = load_addr; + so->original_name = name; + #ifndef __CYGWIN__ char *p; char buf[__PMAX]; @@ -854,6 +858,8 @@ windows_make_so (const char *name, LPVOID load_addr) GetSystemDirectory (buf, sizeof (buf)); strcat (buf, "\\ntdll.dll"); } + + so->name = buf; #else wchar_t buf[__PMAX]; @@ -866,13 +872,6 @@ windows_make_so (const char *name, LPVOID load_addr) wcscat (buf, L"\\ntdll.dll"); } } -#endif - windows_solib *so = &windows_process.solibs.emplace_back (); - so->load_addr = load_addr; - so->original_name = name; -#ifndef __CYGWIN__ - so->name = buf; -#else if (buf[0]) { char cname[SO_NAME_MAX_PATH_SIZE];