From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id WJzfNQ58zl+QTQAAWB0awg (envelope-from ) for ; Mon, 07 Dec 2020 14:01:34 -0500 Received: by simark.ca (Postfix, from userid 112) id A83201F096; Mon, 7 Dec 2020 14:01:34 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,RDNS_NONE, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 16BCE1EF4B for ; Mon, 7 Dec 2020 14:01:33 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8A0DB394D8C2; Mon, 7 Dec 2020 19:01:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8A0DB394D8C2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1607367692; bh=+yBRxnuo1Rqv5q8Gg3JrbmW0fKeqpuxgCJBBwhFbnvE=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=j/pUN34nsV3xn8asMgb1x+2r5P9ClakKRly3Xx5sP2GHrQUEAIRe8GQ/i1Q6oN3k8 aCYDGrXjMLjl8FNLNMTrmfdNfwTrUz1TlGLn3y53WuhFgHCWZNv7mNwzZVKNVD7Cwj PjwznVSuCCks0+8Ccn3HVxZoOZ6a1JeuIxoXMezE= Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2056.outbound.protection.outlook.com [40.107.244.56]) by sourceware.org (Postfix) with ESMTPS id 5DF30393D02B for ; Mon, 7 Dec 2020 19:01:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5DF30393D02B ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kNFx6cnd8e5Tlo/T8EPzJ2N99h8muYXFaRJxJBpcAsoUFzCxGJS5Y8EJE8fa5X+8lO/fm6YG3QrHJZ4mgplCAb3F55jFrzrm4ROC1pDdZ8p22lhrmRtd1vP+FjoZZHLycLw+656uxnjIPHE6kouJuUvpdDdERPkDLjiziO7b05xsXY9rYlaDYvb+897IPkL1AzvpfFMgdSSNDFve5KxqCZNX7gYixnxMcq58AqhrTovxzmGcw3AGR4UScj1ZIRdj5v+NA7qhu1MFSd6kCOxuiqU/8cQQIzGu7C5Rs7XO5aL8l0/ViqN18dafk3OQtu72xAN2H2ylq7/8GL8i66WZ2w== 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-SenderADCheck; bh=+yBRxnuo1Rqv5q8Gg3JrbmW0fKeqpuxgCJBBwhFbnvE=; b=kDW9eairN2NygO+X81cFW9eBkRPgk1/vBTbAqB0U0C0FxES9RKbxui20Grko1v0Edvg3VQDKy5kCZFtGymT7vpGi7lhdw3H0Q9KzDf9Qae454JVYmq1tYFkfy8BcHkGJwz4TSTDgDOAvTdy19XP3Luys3ZVWP1t7j5Y5MH3Zl5CT9Gx0gy36j2R1tM+Z2dJdjAGUmPxgYvUPTkCnoFzA6/naP854JPDjCcI874U76FrI9u8aFuy8VRqbBJOSnA0yzFkORDBWKZGF9TXi1xTxKRVynHc+9gboj2Ahezw/0qwBa4FWjLwvPPxAhayHniX6r4pI7tQB0BCxgdz7uo8eEw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none Received: from DM6PR12MB2762.namprd12.prod.outlook.com (2603:10b6:5:45::15) by DM6PR12MB4561.namprd12.prod.outlook.com (2603:10b6:5:2ac::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.18; Mon, 7 Dec 2020 19:01:17 +0000 Received: from DM6PR12MB2762.namprd12.prod.outlook.com ([fe80::6841:61df:984b:b3c]) by DM6PR12MB2762.namprd12.prod.outlook.com ([fe80::6841:61df:984b:b3c%3]) with mapi id 15.20.3632.021; Mon, 7 Dec 2020 19:01:17 +0000 To: gdb-patches@sourceware.org Subject: [PATCH 17/30] Add new memory access interface to expr.c Date: Mon, 7 Dec 2020 19:00:18 +0000 Message-Id: <20201207190031.13341-18-Zoran.Zaric@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201207190031.13341-1-Zoran.Zaric@amd.com> References: <20201207190031.13341-1-Zoran.Zaric@amd.com> Content-Type: text/plain X-Originating-IP: [2a00:23c7:5a85:6801:5c7:2db6:d2c2:ae4e] X-ClientProxiedBy: AM4PR0101CA0053.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::21) To DM6PR12MB2762.namprd12.prod.outlook.com (2603:10b6:5:45::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2a00:23c7:5a85:6801:5c7:2db6:d2c2:ae4e) by AM4PR0101CA0053.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.17 via Frontend Transport; Mon, 7 Dec 2020 19:01:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 3498f98b-d18c-4998-fe3e-08d89ae27a34 X-MS-TrafficTypeDiagnostic: DM6PR12MB4561: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ReT2VZ/VDGuBDii3sJlU+VYVWKBPRrTFdfSb5hfQOKb3/e95YeVzkJ1ya+RanPnmbrD3By7VzQZaLk+K3+2K/K3l6tNvMydmhqLWvIgSl4xwW2etCBUvBANNY12dv0MQKcqsuVFf2AFyOsxL48FuRrdplt74rTBbpxYJdvgX/QVZ+CqwDIGv/unY2MEx6UArhbMXd3vVRDsxzPyLOIWXBmwjvm2m6g/yp0z2kLnQbC28ukGHaFfStawzhJqVGDbLkoioYB3TUnEvgWo/pu1nD2VSHELPE0hmqfUvlpLvlYMYbZT7Stvit3cQOB2t3M2E56g8L0gAZtNWtYV/d6ZEUyLWys+cGsO3t+K5BuJZ0eNdpP2lvfxo0H3yr1+Xgrv4 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR12MB2762.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(39860400002)(366004)(136003)(396003)(1076003)(83380400001)(86362001)(6506007)(4326008)(69590400008)(52116002)(36756003)(2906002)(6512007)(8676002)(6486002)(16526019)(2616005)(66946007)(66476007)(66556008)(6916009)(5660300002)(186003)(8936002)(478600001)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?WKmVIOCoG89qK9UlgogvQKcICVjl9e+/OOSAWokS3BVh2Alv4IAW+ecI8sxs?= =?us-ascii?Q?gXaiNKgK+ihL1uDe+KH/NpbXUKNPgdkv3wt1MJEW7b+bEuSiyzywaCdoiirp?= =?us-ascii?Q?NIVk0jMOTKSPqOd/6LUjmXnOtnhSIvHZ2WjZhbeA7MeUcaXAFSGJIV0CmxP8?= =?us-ascii?Q?0yNxBADV0qBNA858R+m/sARRR32oBW9NptUZFDtDZnY6/9XnAS6NKQRzKJtx?= =?us-ascii?Q?+bhPBLB0vg4IzKMTdq3BacfqJ60mqjngk9eycaSoJBVyHdET9tOD70GeAUU8?= =?us-ascii?Q?VxmarboGhsxHy0/r6MQKjwuSHO0TGIYGB8F6pNY8DXNVyNDwts8mf/IXuCy2?= =?us-ascii?Q?q4L+b6mmfjA4uoZJy9b6DhDPhjaJ9BOmXq93Ya9vRk+ZmGX+DA5FmMWPOrrN?= =?us-ascii?Q?L6upB/HkGMhWsdYhP0iOOhAMBqlbOZBg0G+0GwhGli6TWMb7nPeZ9DRQRb6o?= =?us-ascii?Q?D75H+PKizqn99Ks7OFjfuG9E8dFXpTcJx5xFL0mhm3nLJT/R+qYRsRdETbNt?= =?us-ascii?Q?6R+v4mgGR/00JGMVBQknQgyY5L6odtU///FE7BydHxXeR+IegHOKgEyGGXnO?= =?us-ascii?Q?aQDKbOIn8FuYaSV4G5mAq9tQoPkBBu4MRzQFLbVsQVZA+GONy01HovexS1Mc?= =?us-ascii?Q?/gc3gO3jva4QHDKZsj58DSoo5Xkf6lo2eOhreeRGU3HhfHtNvXYPaP3wCrbH?= =?us-ascii?Q?SaDKTHTKt9In7rr/ucvCaWcxvVMHh1pGpGNcQ/IhU/QSuFsu4kaaaPUzQrJu?= =?us-ascii?Q?WLVfu9xpSHd71idX3rrhzCHwjwg+9v8e14HKDpyfVasAUYrigaG83U5eoo6O?= =?us-ascii?Q?eKecsUSCglc0enQLv10flsW3/M8PGLwaQO/e+UhsdkGmGoV/dioFBMFzlLvr?= =?us-ascii?Q?FFkXgKnFT465UAdgjGRoDnFHlvCBsDOshKKk5tMFnt+OwpBCHZqyXt6CCEs9?= =?us-ascii?Q?uSvYH3fFLBr/n7FHO0CP8kIuEqIHraZjV7+39nas/J+BJ2uWxrIBEXgi7HC0?= =?us-ascii?Q?l0BZrxKWtnMAvuAuJkFB2dCBesLdPKotS9Rkn2OgohTGDOX3TqNivqmGntHX?= =?us-ascii?Q?eqFPW4VZ?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB2762.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2020 19:01:17.5015 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-Network-Message-Id: 3498f98b-d18c-4998-fe3e-08d89ae27a34 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VNFfD6qPvppWJfmoDYTMgKCwLxPkG01JUGuWJpe+iJWWEZjm10pYWol3/gfoEDcBi1HMTzmWeZCcbAtBYt04CQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4561 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: , From: Zoran Zaric via Gdb-patches Reply-To: Zoran Zaric Cc: Zoran Zaric Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" DWARF expression evaluator is currently using a few different interfaces for memory access: write_memory_with_notification, read_value_memory, read_memory. They all seem incosistent, while some of them even need a struct value typed argument to be present. This patch is simplifying that interface by replacing it with two new low level functions: read_from_memory and write_to_memory. The advantage of this new interface is that it behaves in the same way as the register access interface from the previous patch. Both of these have the same error returning policy, which will be usefull for the following patches. * dwarf2/expr.c (xfer_from_memory): New function. (read_from_memory): New function. (write_to_memory): New function. (rw_pieced_value): Now calls the read_from_memory and write_to_memory functions. --- gdb/dwarf2/expr.c | 187 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 144 insertions(+), 43 deletions(-) diff --git a/gdb/dwarf2/expr.c b/gdb/dwarf2/expr.c index 0493bd926e..0c9ea51e5b 100644 --- a/gdb/dwarf2/expr.c +++ b/gdb/dwarf2/expr.c @@ -32,6 +32,8 @@ #include "frame.h" #include "gdbsupport/underlying.h" #include "gdbarch.h" +#include "inferior.h" +#include "observable.h" /* Cookie for gdbarch data. */ @@ -186,6 +188,85 @@ write_to_register (struct frame_info *frame, int regnum, return; } +/* Helper for read_from_memory and write_from_memory. */ + +static void +xfer_from_memory (CORE_ADDR address, gdb_byte *readbuf, + const gdb_byte *writebuf, + size_t length, bool stack, int *unavailable) +{ + (*unavailable) = 0; + + enum target_object object + = stack ? TARGET_OBJECT_STACK_MEMORY : TARGET_OBJECT_MEMORY; + + ULONGEST xfered_total = 0; + + while (xfered_total < length) + { + ULONGEST xfered_partial; + + enum target_xfer_status status + = target_xfer_partial (current_top_target (), object, NULL, + (readbuf != nullptr + ? readbuf + xfered_total + : nullptr), + (writebuf != nullptr + ? writebuf + xfered_total + : nullptr), + address + xfered_total, length - xfered_total, + &xfered_partial); + + if (status == TARGET_XFER_OK) + { + xfered_total += xfered_partial; + QUIT; + } + else if (status == TARGET_XFER_UNAVAILABLE) + { + (*unavailable) = 1; + return; + } + else if (status == TARGET_XFER_EOF) + memory_error (TARGET_XFER_E_IO, address + xfered_total); + else + memory_error (status, address + xfered_total); + } +} + +/* Read LENGTH bytes of memory contents starting at ADDRESS. + + The data read is copied to a caller-managed buffer BUF. STACK + indicates whether the memory range specified belongs to a stack + memory region. + + If the memory is unavailable, the UNAVAILABLE output is set. */ + +static void +read_from_memory (CORE_ADDR address, gdb_byte *buffer, + size_t length, bool stack, int* unavailable) +{ + xfer_from_memory (address, buffer, nullptr, length, stack, unavailable); +} + +/* Write LENGTH bytes of memory contents starting at ADDRESS. + + The data written is copied from a caller-managed buffer buf. STACK + indicates whether the memory range specified belongs to a stack + memory region. + + If the memory is unavailable, the UNAVAILABLE output is set. */ + +static void +write_to_memory (CORE_ADDR address, const gdb_byte *buffer, + size_t length, bool stack, int *unavailable) +{ + xfer_from_memory (address, nullptr, buffer, length, stack, unavailable); + + gdb::observers::memory_changed.notify (current_inferior (), address, + length, buffer); +} + struct piece_closure { /* Reference count. */ @@ -374,66 +455,86 @@ rw_pieced_value (struct value *v, struct value *from) bits_to_skip += p->offset; CORE_ADDR start_addr = p->v.mem.addr + bits_to_skip / 8; + bool in_stack_memory = p->v.mem.in_stack_memory; + int unavail = 0; if (bits_to_skip % 8 == 0 && this_size_bits % 8 == 0 && offset % 8 == 0) { /* Everything is byte-aligned; no buffer needed. */ if (from != NULL) - write_memory_with_notification (start_addr, - (from_contents - + offset / 8), - this_size_bits / 8); + write_to_memory (start_addr, (from_contents + offset / 8), + this_size_bits / 8, in_stack_memory, + &unavail); else - read_value_memory (v, offset, - p->v.mem.in_stack_memory, - p->v.mem.addr + bits_to_skip / 8, - v_contents + offset / 8, - this_size_bits / 8); - break; - } - - this_size = bits_to_bytes (bits_to_skip, this_size_bits); - buffer.resize (this_size); - - if (from == NULL) - { - /* Read mode. */ - read_value_memory (v, offset, - p->v.mem.in_stack_memory, - p->v.mem.addr + bits_to_skip / 8, - buffer.data (), this_size); - copy_bitwise (v_contents, offset, - buffer.data (), bits_to_skip % 8, - this_size_bits, bits_big_endian); + read_from_memory (start_addr, (v_contents + offset / 8), + this_size_bits / 8, in_stack_memory, + &unavail); } else { - /* Write mode. */ - if (bits_to_skip % 8 != 0 || this_size_bits % 8 != 0) + this_size = bits_to_bytes (bits_to_skip, this_size_bits); + buffer.resize (this_size); + + if (from == NULL) { - if (this_size <= 8) + /* Read mode. */ + read_from_memory (start_addr, buffer.data (), + this_size, in_stack_memory, + &unavail); + if (!unavail) + copy_bitwise (v_contents, offset, + buffer.data (), bits_to_skip % 8, + this_size_bits, bits_big_endian); + } + else + { + /* Write mode. */ + if (bits_to_skip % 8 != 0 || this_size_bits % 8 != 0) { - /* Perform a single read for small sizes. */ - read_memory (start_addr, buffer.data (), - this_size); + if (this_size <= 8) + { + /* Perform a single read for small sizes. */ + read_from_memory (start_addr, buffer.data (), + this_size, in_stack_memory, + &unavail); + } + else + { + /* Only the first and last bytes can possibly have + any bits reused. */ + read_from_memory (start_addr, buffer.data (), + 1, in_stack_memory, + &unavail); + if (!unavail) + read_from_memory (start_addr + this_size - 1, + &buffer[this_size - 1], 1, + in_stack_memory, &unavail); + } } - else + + if (!unavail) { - /* Only the first and last bytes can possibly have - any bits reused. */ - read_memory (start_addr, buffer.data (), 1); - read_memory (start_addr + this_size - 1, - &buffer[this_size - 1], 1); + copy_bitwise (buffer.data (), bits_to_skip % 8, + from_contents, offset, + this_size_bits, bits_big_endian); + write_to_memory (start_addr, buffer.data (), + this_size, in_stack_memory, + &unavail); } } + } - copy_bitwise (buffer.data (), bits_to_skip % 8, - from_contents, offset, - this_size_bits, bits_big_endian); - write_memory_with_notification (start_addr, - buffer.data (), - this_size); + if (unavail) + { + if (from == NULL) + mark_value_bits_unavailable (v, (offset + bits_to_skip % 8), + this_size_bits); + else + throw_error (NOT_AVAILABLE_ERROR, + _("Can't do read-modify-write to " + "update bitfield; containing word " + "is unavailable")); } } break; -- 2.17.1