From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from hqnvemgate26.nvidia.com (hqnvemgate26.nvidia.com [216.228.121.65]) by sourceware.org (Postfix) with ESMTPS id 8794F395C838 for ; Wed, 24 Jun 2020 01:29:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8794F395C838 Received: from hqpgpgate102.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate26.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Tue, 23 Jun 2020 18:28:56 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate102.nvidia.com (PGP Universal service); Tue, 23 Jun 2020 18:29:09 -0700 X-PGP-Universal: processed; by hqpgpgate102.nvidia.com on Tue, 23 Jun 2020 18:29:09 -0700 Received: from nvbus.nvidia.com (10.124.1.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 24 Jun 2020 01:29:08 +0000 From: Victor Collod To: Subject: [PATCH v3 3/7] amd64_analyze_prologue: merge op and buf Date: Tue, 23 Jun 2020 18:28:53 -0700 Message-ID: <20200624012857.31849-4-vcollod@nvidia.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200624012857.31849-1-vcollod@nvidia.com> References: <0cc93067-1313-6434-4330-61a21736376f@simark.ca> <20200624012857.31849-1-vcollod@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain X-Originating-IP: [10.124.1.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Wed, 24 Jun 2020 01:29:11 -0000 Both variables were used to store function code. 2020-06-23 Victor Collod * amd64-tdep.c (amd64_analyze_prologue): Merge op and buf. --- gdb/amd64-tdep.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c index ff12cb874b8..c1a9b553e20 100644 --- a/gdb/amd64-tdep.c +++ b/gdb/amd64-tdep.c @@ -2374,7 +2374,6 @@ amd64_analyze_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR current_pc, struct amd64_frame_cache *cache) { - enum bfd_endian byte_order =3D gdbarch_byte_order (gdbarch); /* The `endbr64` instruction. */ static const gdb_byte endbr64[4] =3D { 0xf3, 0x0f, 0x1e, 0xfa }; /* There are two variations of movq %rsp, %rbp. */ @@ -2384,8 +2383,7 @@ amd64_analyze_prologue (struct gdbarch *gdbarch, static const gdb_byte mov_esp_ebp_1[2] =3D { 0x89, 0xe5 }; static const gdb_byte mov_esp_ebp_2[2] =3D { 0x8b, 0xec }; =20 - gdb_byte buf[3]; - gdb_byte op; + gdb_byte buf[4]; =20 /* Analysis must not go past current_pc. */ if (pc >=3D current_pc) @@ -2396,24 +2394,20 @@ amd64_analyze_prologue (struct gdbarch *gdbarch, else pc =3D amd64_analyze_stack_align (pc, current_pc, cache); =20 - op =3D read_code_unsigned_integer (pc, 1, byte_order); - - /* Check for the `endbr64` instruction, skip it if found. */ - if (op =3D=3D endbr64[0]) + read_code (pc, buf, 4); + /* Check for the `endbr64' instruction and skip it if found. */ + if (memcmp (buf, endbr64, sizeof (endbr64)) =3D=3D 0) { - read_code (pc + 1, buf, 3); - - if (memcmp (buf, &endbr64[1], 3) =3D=3D 0) - pc +=3D 4; + pc +=3D sizeof (endbr64); + /* If we went past the allowed bound, stop. */ + if (pc >=3D current_pc) + return current_pc; =20 - op =3D read_code_unsigned_integer (pc, 1, byte_order); + /* Update the code buffer, as pc changed. */ + read_code (pc, buf, 1); } =20 - /* If we went past the allowed bound, stop. */ - if (pc >=3D current_pc) - return current_pc; - - if (op =3D=3D 0x55) /* pushq %rbp */ + if (buf[0] =3D=3D 0x55) /* pushq %rbp */ { /* Take into account that we've executed the `pushq %rbp' that starts this instruction sequence. */ --=20 2.20.1