From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01olkn2015.outbound.protection.outlook.com [40.92.53.15]) by sourceware.org (Postfix) with ESMTPS id 581C63856DD6 for ; Tue, 13 Sep 2022 13:55:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 581C63856DD6 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Crzgi1qbycPhFU2rVsSPKIyCNhebF+X9YybkDN82Q6FuzjUng5rDU7dI6qe4flzmC0IZ3TZ/QlQ2q/aSUqOQ8q0NDU/9Ah44BN0UxAGjUuDLRKI5MiCpkBtyJ0c98lMIXfSypKkcce51LH9aD/RewZgCm50FEu/LEwuXj5nalUL0FIeogQsAdcRjdBhdmlhz4fnG1ggTilN44xH2uuFMx11Ws0gw2vo6tQSWAX+LEtSYzkdD/h0kdEg8LJYbZAKtP9YSTwk9SCo7mDrEdB092cHPueeCp+x3UBihPbw4inI2I+30tcar31FPSmInFx2RiIttJT5M8o0JXHz8arLpKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RX22OLEayluU+ztTj/IIox1mIjCxKuUMN4bthX0Ap2s=; b=FSUPXtkWKnDOys8uaO/VzXXv0xgIRDjyKJTqiK3mWPP7uMUscuiyD7KQQDFIaeAkIRfjaELyVzxpxHAT/HRf872htJhpADGUHVgcCBwjp7wcqN6+CGK79sIA/N0Sp0rE3ik6+7TCPe9a79QO3OeBkA6IfFi+EUAr0rxX6AV3fWhTg0AVj1TYR1CUuIBHYEC4H2Uo5v524xuDN5S8F6hJ51YyOaciG3em7MxXOWp2e41FEqoqmxUy5scXKZOGJkVrGZcgDMjbJSp5Nq9P9g3WKk6u1cs/2lhvsBXxblEcDcvIaiPBxp2E7WnXwBPcNSGpmNpeb/+ss5EfdFtGcaGfVg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from TY0PR0101MB4285.apcprd01.prod.exchangelabs.com (2603:1096:400:1b0::11) by SEZPR01MB4945.apcprd01.prod.exchangelabs.com (2603:1096:101:9c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Tue, 13 Sep 2022 13:55:35 +0000 Received: from TY0PR0101MB4285.apcprd01.prod.exchangelabs.com ([fe80::8c3e:86b1:feb7:f027]) by TY0PR0101MB4285.apcprd01.prod.exchangelabs.com ([fe80::8c3e:86b1:feb7:f027%7]) with mapi id 15.20.5612.022; Tue, 13 Sep 2022 13:55:35 +0000 From: TaiseiIto To: gdb-patches@sourceware.org Cc: tom@tromey.com, TaiseiIto Subject: [PATCH] Fix null pointer representations Date: Tue, 13 Sep 2022 22:55:03 +0900 Message-ID: X-Mailer: git-send-email 2.34.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [XgmNFhvkKEz9/iiOGH6YeZZ8XDnSv6km] X-ClientProxiedBy: TYCP286CA0101.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b4::14) To TY0PR0101MB4285.apcprd01.prod.exchangelabs.com (2603:1096:400:1b0::11) X-Microsoft-Original-Message-ID: <20220913135503.11555-1-taisei1212@outlook.jp> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TY0PR0101MB4285:EE_|SEZPR01MB4945:EE_ X-MS-Office365-Filtering-Correlation-Id: 041cceb5-5d27-4f26-39f1-08da958fa171 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4OFJNcs7Yiln+vyOKAdxvGKTIzDA/I8Q6YpL3HPQ7bhbF1NJ75qMfiqB/T0fF1TdsSDtZEQqlqNYUbAu4Mio3CPpZGHTZ4QLS2GL49pIQ6WEAdgyy68KO6pPzFOUfI7Bp85dwSBAarqx0+b3ZuMEZsu3P2UT17fuYb0RXwk7O0XDfBIT9dPbA66Fy2rxunC5E3iQ9xiyDFoYyeuKVOFSV9Fwyrc4AHKgHyrW7koL5/vOfKGaFwGu1/E/4iw0RQKBDtN5l/ZVmpUBpWJAAmoYhsNDLdmdXOd62OAiwJ0rb2aclTsa9yrTQ6cmX7P2hCVbaVEUAGvXXbFmKwuFpk7T5CvRHtn3tINpoWUmQ1HKO/seX/vpkyP4jGdxWDVL+5DC876h4qKNu2zW6iOcFLKE2b0kxgkrIbuH+MMPlmZsZNttTuVWpQN+bC06OlzskdzvkYvHPDVZmYDhTfJC8okMhQ1slKNiuw3F2J9iveRU8gPS4OaLJViouoepZ+U+GGa9l9sHTqDT99LUWncgxdLYVY54graajm+jvQM4TGTunmPBMdE8k5jcKVmT4d2KjoZQvm0GkDpWV8LsYrz0vqLe8uiRB1llk6xuB7B0QyJbUrw0n7UmmOrsky5Qr/71smvvBBYyIY/igEhrVt5cXynknQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?weLbLDuI1uJlv8KeW/y5zVzRIuqgLfEjGgeu6asHNqKOixj1c0EXRDOxzUlD?= =?us-ascii?Q?2TB6ovVP0O0gbdUyQCl9hJfzMKwNyyq7IHFZYLEViodjhUljB8ChiwA4P6nC?= =?us-ascii?Q?Y8072aQT5Vwnrm1L3vhEbWYGzEBGCeBsyESnqvCaeA3mN/Jqf17vJN8/GkuG?= =?us-ascii?Q?SO5uqBMMb72FWXGW7YJiV5OJqHKqnVtPh/N0GIXLM52Nx7jUrKT/8YYmFlZp?= =?us-ascii?Q?t1vUPYq662V4suwnVxYLuwitffiOZ0rTC9VO7sz8ex3jKdrhqrjWJDalIQro?= =?us-ascii?Q?fY37qaRMt8JCvGtAmy4DdzeJXchARoz0amn42m8cIyVzmm/VRrSWNJjPmuQm?= =?us-ascii?Q?nDdZpYJQxydnJ8WRW+PSeOD6QNgIU1l04fNDf4YHAH3aUUKrOjDunOntFbYp?= =?us-ascii?Q?azvBNpFxL8GsvFkZWpj/C8ZpuuTIMCKW+fe3ao1hAuYs0GadybFHJAZbVg6o?= =?us-ascii?Q?pxCgAfEeBdP7EZcWEMd0Sqy1dyX0HT570OoVMrwRA3+svBG/afw0Z9Movu38?= =?us-ascii?Q?+ft5C/7hh8DnD4PBGWeXMB+7ivhMpfycFjQHE+Wvw4K33UDX24qQIECjMXXs?= =?us-ascii?Q?d7kBHotmvoTjk06Rqa+Ts2x0cTDcwInV1zmtryOIWNUr6rgK8E/LR3MS5eFz?= =?us-ascii?Q?s8imfosFVtqvb4oFvthtyjmKj/7lbfICB1+MrwpOkuz5RC4GGEbl6rc22wBM?= =?us-ascii?Q?oGSmY+7JsfeB9rtMbiUCGnSkqn+rWSfOqOR8oh/Rd1ReRhojqfir1s5oMPfL?= =?us-ascii?Q?5zVFBdP5Cki1BEaQ92ASHYeO3+J8XAEkTeLHgfPCrmwyqgZRpyC/WZiwFuTL?= =?us-ascii?Q?xtf5crHmsLitsMViOsjrdWgE+X8vdlVxu31Nes/0Mk/Lp2y+4GOaNq+epoPO?= =?us-ascii?Q?rcvlcvhmHYfliYz3/aHLaWvjBtuw2VCh6q/5OCM2d8xPOSMcRn2F6rboB+BI?= =?us-ascii?Q?FJpTyytoKd3LCApVfnB8Wwh10IojOUhTcT97GnrHIehJgVu7RNAh7f0pqbga?= =?us-ascii?Q?wh5bfX7FIMrdBUOSxuTZLn17sIDnzWatVqczyqVzWmzgsSQwC8iN03rYQ6ia?= =?us-ascii?Q?SZUNuAmiajceng0JhMBPjNwOF7V9b2igZDtldj/0KTt3Dh1BexW7k1xHGWvQ?= =?us-ascii?Q?vNhjtD901uo808WB/2thKNA0rjbNNvL+7j1w9PT/RV8W3v6UJ+7UTXJg9WRZ?= =?us-ascii?Q?1MSnh/ZzxrVd9ThSeXyFYvdrIYEJzjTVBTDzU8Ctmf8WrrrAh23xYbvxpka4?= =?us-ascii?Q?Z8ZEPtlKJhjFiHzV9f9JpK+XJKTVGgtoDvTArfeKYQ=3D=3D?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-d8e84.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 041cceb5-5d27-4f26-39f1-08da958fa171 X-MS-Exchange-CrossTenant-AuthSource: TY0PR0101MB4285.apcprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2022 13:55:34.9478 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR01MB4945 X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Sep 2022 13:55:42 -0000 Since "NULL" and "0" are used to represent invalid address in function "gdbarch_find_by_info" in "binutils-gdb/gdb/arch-utils.c", I modified them to "nullptr". --- gdb/arch-utils.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index 9bd4f0ddae6..01111b69d6b 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -1326,13 +1326,13 @@ gdbarch_find_by_info (struct gdbarch_info info) gdbarch_info_fill (&info); /* Must have found some sort of architecture. */ - gdb_assert (info.bfd_arch_info != NULL); + gdb_assert (info.bfd_arch_info != nullptr); if (gdbarch_debug) { gdb_printf (gdb_stdlog, "gdbarch_find_by_info: info.bfd_arch_info %s\n", - (info.bfd_arch_info != NULL + (info.bfd_arch_info != nullptr ? info.bfd_arch_info->printable_name : "(null)")); gdb_printf (gdb_stdlog, @@ -1351,16 +1351,16 @@ gdbarch_find_by_info (struct gdbarch_info info) /* Find the tdep code that knows about this architecture. */ for (rego = gdbarch_registry; - rego != NULL; + rego != nullptr; rego = rego->next) if (rego->bfd_architecture == info.bfd_arch_info->arch) break; - if (rego == NULL) + if (rego == nullptr) { if (gdbarch_debug) gdb_printf (gdb_stdlog, "gdbarch_find_by_info: " "No matching architecture\n"); - return 0; + return nullptr; } /* Ask the tdep code for an architecture that matches "info". */ @@ -1368,12 +1368,12 @@ gdbarch_find_by_info (struct gdbarch_info info) /* Did the tdep code like it? No. Reject the change and revert to the old architecture. */ - if (new_gdbarch == NULL) + if (new_gdbarch == nullptr) { if (gdbarch_debug) gdb_printf (gdb_stdlog, "gdbarch_find_by_info: " "Target rejected architecture\n"); - return NULL; + return nullptr; } /* Is this a pre-existing architecture (as determined by already @@ -1390,10 +1390,10 @@ gdbarch_find_by_info (struct gdbarch_info info) new_gdbarch->bfd_arch_info->printable_name); /* Find the existing arch in the list. */ for (list = ®o->arches; - (*list) != NULL && (*list)->gdbarch != new_gdbarch; + (*list) != nullptr && (*list)->gdbarch != new_gdbarch; list = &(*list)->next); /* It had better be in the list of architectures. */ - gdb_assert ((*list) != NULL && (*list)->gdbarch == new_gdbarch); + gdb_assert ((*list) != nullptr && (*list)->gdbarch == new_gdbarch); /* Unlink SELF. */ self = (*list); (*list) = self->next; -- 2.34.1