From patchwork Mon Feb 12 15:36:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 10213389 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3FE4160329 for ; Mon, 12 Feb 2018 15:42:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E02E28A49 for ; Mon, 12 Feb 2018 15:42:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 21E0228B0F; Mon, 12 Feb 2018 15:42:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C21F128A9A for ; Mon, 12 Feb 2018 15:42:12 +0000 (UTC) Received: from localhost ([::1]:45560 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elGF9-0006ks-Mi for patchwork-qemu-devel@patchwork.kernel.org; Mon, 12 Feb 2018 10:42:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55652) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elGBM-0003Fv-7D for qemu-devel@nongnu.org; Mon, 12 Feb 2018 10:38:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elGBI-0003p3-It for qemu-devel@nongnu.org; Mon, 12 Feb 2018 10:38:16 -0500 Received: from mail-by2nam01on0066.outbound.protection.outlook.com ([104.47.34.66]:37502 helo=NAM01-BY2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1elGBI-0003m5-3R for qemu-devel@nongnu.org; Mon, 12 Feb 2018 10:38:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Jz5F8LNiwpEKW4LLBcsXqKy0ISDlsDa2NoZQjM2pCr0=; b=3E5vniDSw5BZHKt3JUD8vu3BHmslBIhcCIZvqTHftsONYO5WaN8YVdTYCz9XWP4aSQ8UdoN6oy+9wqfPO8kPKyFuFpzpX3yyzAaMV1MhwaLF0GSiukUxR3i4dJYyP3NwHlrKN7HOLw/j5xvBwllrJeOrhClSotaVATDeXtseyTQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by BY2PR12MB0146.namprd12.prod.outlook.com (10.162.82.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.485.10; Mon, 12 Feb 2018 15:38:05 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Mon, 12 Feb 2018 09:36:51 -0600 Message-Id: <20180212153715.87555-5-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180212153715.87555-1-brijesh.singh@amd.com> References: <20180212153715.87555-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: SN4PR0801CA0004.namprd08.prod.outlook.com (10.161.215.142) To BY2PR12MB0146.namprd12.prod.outlook.com (10.162.82.19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 586106fe-fbe3-4fcb-a432-08d5722e9d32 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:BY2PR12MB0146; X-Microsoft-Exchange-Diagnostics: 1; BY2PR12MB0146; 3:nGuZJNbbDvq5EAa756v7RfPsybzrXW9kUN4YZrjqCJ2dcwl3PyVKjN9HIj1FiUzaSrJVei3Ykbs6Bt07mV+0UszC7BTXGJ6nJGX2aRUSlft8qsJJOeg8Ryce6tzpiyD0jjF2Ra2ywZjGS4pOEYwQTO3MadmtoKelbfC6BjCHVxb7O/469LeS4cP17u1SJ4pBUdtYeOus8qWRe+Wbimmq6CqkxrU86S1HHUMnJUdEF2StYRrKluK4sUdOQgolV+1O; 25:79+DDkZ6OAGBIMG3joVKCZcI4DmWyOOQBurL4PpHpFehzSEoIT4rvWnpk3fRo5WjjlpY9xPNkdHBmk6ap8ppd4A2P/1SLE6VDfbhFgYEj41yQKLDiXQYM8VvS1AEg558YonwWs4YNg8Yq1XsXX5eG8ermu10Zfin10AU1Km9uTBWJKxlOTaT26zR0ck3SxPeq6JdxyUYlrqzRjUlYo6ebLRJw2Q0AJ6Sufhuj5kioLLLwR0ZkN4nu6t8KN6gIZVcwz58vr9bhAKDm56KyRfygIRCHVz9a6g8Tn5fJptP/DI9t1eFqPv6AAABEZKfODs3lgD9HR1cq7HefExUu6DzSg==; 31:gRlAPCOgWTJRxRHCkjX7mYNtCKL+QYJHMFBuZ7O5WBRSLLRLkrV+PRQWVw+rPcCXfZWDw3K7gayLqGipmk+IgYMc5E6yqAEJeRSV5UfAw2PuPIEkZ7VL/RMaGommFYY6CDQIMCsAvJ/z72KI2Qv1YILuvlZ4ytK5aj4O+b45QMwBRBAC9JmV8ly/ZZBdLL3vWrBdrkQkVSv7WzRWPLbSXHEGLe9IUS9vzHioHIt4WuE= X-MS-TrafficTypeDiagnostic: BY2PR12MB0146: X-Microsoft-Exchange-Diagnostics: 1; BY2PR12MB0146; 20:zyuzBjKfJTLeOuy0ClXflMC9eDOggWTfwUcHwuQdGBFOygYuQVpmEMKb+B9bT8EgOg41J+AmPFXHd0Aune+yGx2DHVSyG1VQgRXDp6KQa2fHApMW/soV7swt7by7qi0BNMRo/pLDuwm81brrYoftlnCkQBMmUYHFJCbh8gkA0ew7MwG9wwL6+jw7Y5Yc4DawV7Tl6yKKZHOOEwbrE1uUiD00qFWyzeyTcVNfSITiEXkN99OzFkKPHzIk0mqkLm4Gx8yyJIbjo1RyDrc3352d5GOOQp3rBdt/SYkl0U/mFrqGWiQ6sPvkS939yH6JwnYhB1yklLkXwNmCeS96ls8jg8npghLSWcCSyaj3fQubn7zoHvSluV8Rpxdh031hOnA8kLqoNXRJepPkotlPVdRQZgC+blzMzEc/NuJZIShXIZmHaPbvbH54UMa4dDBPQA31m1VEFqofmSNVhQ8AAmGrw6yftx37V6YwXq6qIdZ2WTF9jhY/4iJ0g3cjgd0e1xwC; 4:TMy9Fgvv3io1HiP7wS3+KiAtLnnf70TCC38iBwba6kAUIKTrrGokcVf95G60M05gW4yqCwK1Sn+CKQEe405/Agwb/KoLvNZ2dX/cToLN7+mqoRGJWuyks1o8LihKEzHpCJJ3PhikEG8s0Qi2BPd/ME7NjTdZ50sySkpFnVeDUceod7Cgl3Lj+4/rbhaxTPAUHDk3uUwhkNbxs7sfAYG6PxSoq2pce1AuW8+BqrUgenorpWP2+QiroX5s/N6oJaYO4FLSci1zRxSpOkh9djMsfob3goGEz3cp23uRcKygsh/D+pQYxoY+dqvsDhYD1PG72GLpUXO45HZDncIfGa0zcQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85827821059158)(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(3231101)(2400082)(944501161)(6055026)(6041288)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011); SRVR:BY2PR12MB0146; BCL:0; PCL:0; RULEID:; SRVR:BY2PR12MB0146; X-Forefront-PRVS: 0581B5AB35 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(346002)(396003)(366004)(376002)(199004)(189003)(25786009)(53416004)(66066001)(8676002)(7416002)(105586002)(59450400001)(81156014)(76176011)(81166006)(5660300001)(97736004)(186003)(16526019)(8936002)(106356001)(50226002)(2361001)(6116002)(3846002)(47776003)(305945005)(1076002)(86362001)(26005)(2351001)(7736002)(478600001)(51416003)(36756003)(4326008)(2906002)(53936002)(6666003)(2950100002)(8656006)(52116002)(6486002)(48376002)(39060400002)(68736007)(54906003)(16586007)(7696005)(386003)(316002)(6916009)(50466002)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR12MB0146; H:wsp141597wss.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR12MB0146; 23:vshVlQ4xVqq6++/8ZinecandqaKREGKZdqSqqlffs?= =?us-ascii?Q?zsIGTSz19pyw6D8I6nkn3onnrvpz65g22v0sGZ4tMG/Bzv/QJKWY9qfe94Gj?= =?us-ascii?Q?t1om1X02n8v1+9v2pWjKhIWW3ssmTJoUhCl3EK4WFBY48qNqXDJX7b8qZuik?= =?us-ascii?Q?B3TApjH8wbwrOfE2lPTCRhlDDsXleaZJD+5MrSdHQ1xzQcBUJbaBo++hg0gY?= =?us-ascii?Q?sS1Zwu3xag1v5JU+ih+x6QyR2F+4Lm0kFSFGsC7UVfhl9DwDtVa+ry0lh1GY?= =?us-ascii?Q?6VbSVvOP3zT37uzPEkFPLIvrixvIECknfRd5ApKXTgl35NAB5OQYa075vyd8?= =?us-ascii?Q?j8RJgBWWr2cW51pKwR9OZeMmMy4jqlBT+V9RWPmLr6UuJM4L769ZKcZI6w9R?= =?us-ascii?Q?HK8uxF2lFuZw5FwxGEDiWL9pY4Hz6+SvOkHatQp4U2cTNbRpVweuh3vYDOcn?= =?us-ascii?Q?sMRfm3bjosFWEgGClJM5qhLExJPhAaSR12eL6PDE9i3miYoqGlxuR86XPaXH?= =?us-ascii?Q?ZdU3lihbb7gtU354owl7BeKnmKVNk4IdWIEt0izsQ67V/kif6upiKysOUE2Z?= =?us-ascii?Q?Sx2Lb2KFYLds3erMuwAT4qp1xzpm+MfYTE4uOUb54a0ViCjhSLlmeDrpZCTb?= =?us-ascii?Q?D1QSl1MT6IhqxPdWpS8b77nVOTeByWZ9xmjPmR1crmxPrttpTM9rCg+nb2EN?= =?us-ascii?Q?Zxu/s78PHuDEb+5K0JSZyThsIqaU8PlyHsqVSWZMTtKibzv4IqgEGK4SlN/k?= =?us-ascii?Q?XiopUDxBIBnMIuvT+fgk4ZxcXscAWXi6xq5xLd7hmPsftRPFefW1XiQaTOW3?= =?us-ascii?Q?+S7eB3mLO5Wf2K+tj2Ht7+/E20s79a9GZYDymY551iMkAFJb4N7p3Ktcxx2g?= =?us-ascii?Q?c3vPCQRBFtA3wc61zAIk9wM70MfxoUU0Bg9L+03CTpl0CzBYlIA6vC6EM91R?= =?us-ascii?Q?Rn0q+tyHrMpgVvXJv+fGkKcgliSZilx0UVhzhIHt50cH8g1dOHvgCbztpako?= =?us-ascii?Q?wkYOAiHh59u6yZDWOBpTxNP4eaTeopsL2P3YynOHznhzBwf3kopvmAsXzT2e?= =?us-ascii?Q?URhpXffFzQ90k3naKsJ8X0GwF40K+u9nFK70r5FKGnawaem5om0+Vue+B44n?= =?us-ascii?Q?6DfRcWFvl4M7n8oYhpwRBvYAYE37bcbM7egVBySGZVrZ6lgYflIkbetgAemA?= =?us-ascii?Q?cxc7/7FQENrBXxeqlcKxzes4HIegB5tMjZOsp/1wKVCekRJ6Z4zGl0k+GtlO?= =?us-ascii?Q?S38W4iy+29U/+PoUtxycj7vjggSWb2G6h5V7jLMzVqnhIRU27urTt6vwvdPs?= =?us-ascii?B?dz09?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR12MB0146; 6:8HvSpk5R9zGXzFlT/F7SoS0S10Wx4gUKvsZTdi0u+53zVTdrqFqxuFcH+mkhgsdan6+iGF0hQGSQmTOTNPIaWKCLcYX+UmNO5+vTX7f9VPVdUk3dlEMIKTLMn5Zad5rrqmTFCOng//SRbS0zV95+1U+p1L9mhCvuoI2NfIO2H9wZ/0alg20zV0GAil7lN1Q1RyVDcuHN9XsAVbcjUJ4QcX/OE0ljjfHN4HWpQjToEtI+KYzr0KFExOO3bY4tQwWn2F/fdFn9hBBgCRj8tWXR8bnQRdu0EOToFGkIRuld8sFsx1jYVaCJZ+wBuCPmCEV7cub2LYFIJ100ent9q6FyfQ==; 5:1maHLhO/lpjVzy+Sm2CbHZrheZzzJXCTHI0fiA6lRnfT5+m6IXqya8JxxamU43g1wFMAfPuYTVTifXA5kG7DQEd6nPNFfADBh/804Jw4ZdPaof2InN1zqHEHErfpRhE1zGQMjVjLAV25Mbr3hQZZ7+AVZMzZjdFwuSiao+Kii2A=; 24:b2BFgMi2D7cCfEOdGrayIhEmUbdQR0Fq6m89Xf43x9fCI/53iLRLEkIvwyy3Ev9d/D6WxT6dx99hdBrFVFr2ShEg3oOzxRMDwzhR9ZhtSNM=; 7:1DRF/iAHyi0PgHDLHON/DiCAmAOi7QYFPGpRt6p7ChDw2gUk3T64ExQ6iRa2xfTdNqN1t4UMGg+Olq7Gxtt+QYTgPVzCkpb1ADycSiZxvskL7XgwC5wthSwjaQolWOFyebdLBye5VC5FHRuPKCxUK8VAENRXEXth30YiF3OauzY/UcEmn2NwrEuIKrJEUcVmwbO+V5QID6JOSaY3uE8Z0xZWELidXuelxhyErWOEv7BfwIPIHzOn3aItOL0Wiifl SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR12MB0146; 20:ozcbD9ULJ9rHMjczuxt3s5mXglKgkN2jeEfUrt2W43+3MnWDpGk0Rv691T39U9JzjAoY4Fx6JfvpZtNxytbLwGIkdo189uljoZipGpnO0oJaKrcRvAdt8NP/yy2BbPvtydeypRYjcJIBhz/DPbI2EcChMGuZgmLrH50at3Kmg5/mB3jIBy8oV66ACFRbYBTgcKfatVW7Q1Wp7rDyATYRbudYNs5CVtAWClTPArsV9lDAw3XzSVkew3OwoVJN5d+e X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2018 15:38:05.6699 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 586106fe-fbe3-4fcb-a432-08d5722e9d32 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR12MB0146 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.66 Subject: [Qemu-devel] [PATCH v8 04/28] monitor/i386: use debug APIs when accessing guest memory X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Richard Henderson , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Updates HMP commands to use the debug version of APIs when accessing the guest memory. Cc: Paolo Bonzini Cc: Peter Crosthwaite Cc: Richard Henderson Cc: "Dr. David Alan Gilbert" Cc: Markus Armbruster Cc: Eduardo Habkost Signed-off-by: Brijesh Singh --- cpus.c | 2 +- disas.c | 2 +- monitor.c | 6 +++--- target/i386/helper.c | 14 ++++++------ target/i386/monitor.c | 60 +++++++++++++++++++++++++++------------------------ 5 files changed, 44 insertions(+), 40 deletions(-) diff --git a/cpus.c b/cpus.c index f298b659f467..fdd40d9e8ead 100644 --- a/cpus.c +++ b/cpus.c @@ -2214,7 +2214,7 @@ void qmp_pmemsave(int64_t addr, int64_t size, const char *filename, l = sizeof(buf); if (l > size) l = size; - cpu_physical_memory_read(addr, buf, l); + cpu_physical_memory_read_debug(addr, buf, l); if (fwrite(buf, 1, l, f) != l) { error_setg(errp, QERR_IO_ERROR); goto exit; diff --git a/disas.c b/disas.c index d4ad1089efb3..fcedbf263302 100644 --- a/disas.c +++ b/disas.c @@ -586,7 +586,7 @@ static int physical_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length, struct disassemble_info *info) { - cpu_physical_memory_read(memaddr, myaddr, length); + cpu_physical_memory_read_debug(memaddr, myaddr, length); return 0; } diff --git a/monitor.c b/monitor.c index f4992505b14f..48a9f278d1ec 100644 --- a/monitor.c +++ b/monitor.c @@ -1361,7 +1361,7 @@ static void memory_dump(Monitor *mon, int count, int format, int wsize, if (l > line_size) l = line_size; if (is_physical) { - cpu_physical_memory_read(addr, buf, l); + cpu_physical_memory_read_debug(addr, buf, l); } else { if (cpu_memory_rw_debug(cs, addr, buf, l, 0) < 0) { monitor_printf(mon, " Cannot access memory\n"); @@ -1567,8 +1567,8 @@ static void hmp_sum(Monitor *mon, const QDict *qdict) sum = 0; for(addr = start; addr < (start + size); addr++) { - uint8_t val = address_space_ldub(&address_space_memory, addr, - MEMTXATTRS_UNSPECIFIED, NULL); + uint8_t val; + cpu_physical_memory_read_debug(addr, &val, 1); /* BSD sum algorithm ('sum' Unix command) */ sum = (sum >> 1) | (sum << 15); sum += val; diff --git a/target/i386/helper.c b/target/i386/helper.c index 9fba146b7fb0..58fb6eec562a 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -757,7 +757,7 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) if (la57) { pml5e_addr = ((env->cr[3] & ~0xfff) + (((addr >> 48) & 0x1ff) << 3)) & a20_mask; - pml5e = x86_ldq_phys(cs, pml5e_addr); + pml5e = ldq_phys_debug(cs, pml5e_addr); if (!(pml5e & PG_PRESENT_MASK)) { return -1; } @@ -767,7 +767,7 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) pml4e_addr = ((pml5e & PG_ADDRESS_MASK) + (((addr >> 39) & 0x1ff) << 3)) & a20_mask; - pml4e = x86_ldq_phys(cs, pml4e_addr); + pml4e = ldq_phys_debug(cs, pml4e_addr); if (!(pml4e & PG_PRESENT_MASK)) { return -1; } @@ -788,14 +788,14 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) { pdpe_addr = ((env->cr[3] & ~0x1f) + ((addr >> 27) & 0x18)) & a20_mask; - pdpe = x86_ldq_phys(cs, pdpe_addr); + pdpe = ldq_phys_debug(cs, pdpe_addr); if (!(pdpe & PG_PRESENT_MASK)) return -1; } pde_addr = ((pdpe & PG_ADDRESS_MASK) + (((addr >> 21) & 0x1ff) << 3)) & a20_mask; - pde = x86_ldq_phys(cs, pde_addr); + pde = ldq_phys_debug(cs, pde_addr); if (!(pde & PG_PRESENT_MASK)) { return -1; } @@ -808,7 +808,7 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) pte_addr = ((pde & PG_ADDRESS_MASK) + (((addr >> 12) & 0x1ff) << 3)) & a20_mask; page_size = 4096; - pte = x86_ldq_phys(cs, pte_addr); + pte = ldq_phys_debug(cs, pte_addr); } if (!(pte & PG_PRESENT_MASK)) { return -1; @@ -818,7 +818,7 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) /* page directory entry */ pde_addr = ((env->cr[3] & ~0xfff) + ((addr >> 20) & 0xffc)) & a20_mask; - pde = x86_ldl_phys(cs, pde_addr); + pde = ldl_phys_debug(cs, pde_addr); if (!(pde & PG_PRESENT_MASK)) return -1; if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) { @@ -827,7 +827,7 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) } else { /* page directory entry */ pte_addr = ((pde & ~0xfff) + ((addr >> 10) & 0xffc)) & a20_mask; - pte = x86_ldl_phys(cs, pte_addr); + pte = ldl_phys_debug(cs, pte_addr); if (!(pte & PG_PRESENT_MASK)) { return -1; } diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 75429129fde0..55ea10deb8ef 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -68,7 +68,7 @@ static void tlb_info_32(Monitor *mon, CPUArchState *env) pgd = env->cr[3] & ~0xfff; for(l1 = 0; l1 < 1024; l1++) { - cpu_physical_memory_read(pgd + l1 * 4, &pde, 4); + cpu_physical_memory_read_debug(pgd + l1 * 4, &pde, 4); pde = le32_to_cpu(pde); if (pde & PG_PRESENT_MASK) { if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) { @@ -76,7 +76,8 @@ static void tlb_info_32(Monitor *mon, CPUArchState *env) print_pte(mon, env, (l1 << 22), pde, ~((1 << 21) - 1)); } else { for(l2 = 0; l2 < 1024; l2++) { - cpu_physical_memory_read((pde & ~0xfff) + l2 * 4, &pte, 4); + cpu_physical_memory_read_debug((pde & ~0xfff) + l2 * 4, + &pte, 4); pte = le32_to_cpu(pte); if (pte & PG_PRESENT_MASK) { print_pte(mon, env, (l1 << 22) + (l2 << 12), @@ -97,12 +98,12 @@ static void tlb_info_pae32(Monitor *mon, CPUArchState *env) pdp_addr = env->cr[3] & ~0x1f; for (l1 = 0; l1 < 4; l1++) { - cpu_physical_memory_read(pdp_addr + l1 * 8, &pdpe, 8); + cpu_physical_memory_read_debug(pdp_addr + l1 * 8, &pdpe, 8); pdpe = le64_to_cpu(pdpe); if (pdpe & PG_PRESENT_MASK) { pd_addr = pdpe & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { - cpu_physical_memory_read(pd_addr + l2 * 8, &pde, 8); + cpu_physical_memory_read_debug(pd_addr + l2 * 8, &pde, 8); pde = le64_to_cpu(pde); if (pde & PG_PRESENT_MASK) { if (pde & PG_PSE_MASK) { @@ -112,7 +113,8 @@ static void tlb_info_pae32(Monitor *mon, CPUArchState *env) } else { pt_addr = pde & 0x3fffffffff000ULL; for (l3 = 0; l3 < 512; l3++) { - cpu_physical_memory_read(pt_addr + l3 * 8, &pte, 8); + cpu_physical_memory_read_debug(pt_addr + l3 * 8, + &pte, 8); pte = le64_to_cpu(pte); if (pte & PG_PRESENT_MASK) { print_pte(mon, env, (l1 << 30) + (l2 << 21) @@ -137,7 +139,7 @@ static void tlb_info_la48(Monitor *mon, CPUArchState *env, uint64_t pdp_addr, pd_addr, pt_addr; for (l1 = 0; l1 < 512; l1++) { - cpu_physical_memory_read(pml4_addr + l1 * 8, &pml4e, 8); + cpu_physical_memory_read_debug(pml4_addr + l1 * 8, &pml4e, 8); pml4e = le64_to_cpu(pml4e); if (!(pml4e & PG_PRESENT_MASK)) { continue; @@ -145,7 +147,7 @@ static void tlb_info_la48(Monitor *mon, CPUArchState *env, pdp_addr = pml4e & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { - cpu_physical_memory_read(pdp_addr + l2 * 8, &pdpe, 8); + cpu_physical_memory_read_debug(pdp_addr + l2 * 8, &pdpe, 8); pdpe = le64_to_cpu(pdpe); if (!(pdpe & PG_PRESENT_MASK)) { continue; @@ -160,7 +162,7 @@ static void tlb_info_la48(Monitor *mon, CPUArchState *env, pd_addr = pdpe & 0x3fffffffff000ULL; for (l3 = 0; l3 < 512; l3++) { - cpu_physical_memory_read(pd_addr + l3 * 8, &pde, 8); + cpu_physical_memory_read_debug(pd_addr + l3 * 8, &pde, 8); pde = le64_to_cpu(pde); if (!(pde & PG_PRESENT_MASK)) { continue; @@ -175,9 +177,7 @@ static void tlb_info_la48(Monitor *mon, CPUArchState *env, pt_addr = pde & 0x3fffffffff000ULL; for (l4 = 0; l4 < 512; l4++) { - cpu_physical_memory_read(pt_addr - + l4 * 8, - &pte, 8); + cpu_physical_memory_read_debug(pt_addr + l4 * 8, &pte, 8); pte = le64_to_cpu(pte); if (pte & PG_PRESENT_MASK) { print_pte(mon, env, (l0 << 48) + (l1 << 39) + @@ -198,7 +198,7 @@ static void tlb_info_la57(Monitor *mon, CPUArchState *env) pml5_addr = env->cr[3] & 0x3fffffffff000ULL; for (l0 = 0; l0 < 512; l0++) { - cpu_physical_memory_read(pml5_addr + l0 * 8, &pml5e, 8); + cpu_physical_memory_read_debug(pml5_addr + l0 * 8, &pml5e, 8); pml5e = le64_to_cpu(pml5e); if (pml5e & PG_PRESENT_MASK) { tlb_info_la48(mon, env, l0, pml5e & 0x3fffffffff000ULL); @@ -273,7 +273,7 @@ static void mem_info_32(Monitor *mon, CPUArchState *env) last_prot = 0; start = -1; for(l1 = 0; l1 < 1024; l1++) { - cpu_physical_memory_read(pgd + l1 * 4, &pde, 4); + cpu_physical_memory_read_debug(pgd + l1 * 4, &pde, 4); pde = le32_to_cpu(pde); end = l1 << 22; if (pde & PG_PRESENT_MASK) { @@ -282,7 +282,8 @@ static void mem_info_32(Monitor *mon, CPUArchState *env) mem_print(mon, &start, &last_prot, end, prot); } else { for(l2 = 0; l2 < 1024; l2++) { - cpu_physical_memory_read((pde & ~0xfff) + l2 * 4, &pte, 4); + cpu_physical_memory_read_debug((pde & ~0xfff) + l2 * 4, + &pte, 4); pte = le32_to_cpu(pte); end = (l1 << 22) + (l2 << 12); if (pte & PG_PRESENT_MASK) { @@ -315,13 +316,13 @@ static void mem_info_pae32(Monitor *mon, CPUArchState *env) last_prot = 0; start = -1; for (l1 = 0; l1 < 4; l1++) { - cpu_physical_memory_read(pdp_addr + l1 * 8, &pdpe, 8); + cpu_physical_memory_read_debug(pdp_addr + l1 * 8, &pdpe, 8); pdpe = le64_to_cpu(pdpe); end = l1 << 30; if (pdpe & PG_PRESENT_MASK) { pd_addr = pdpe & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { - cpu_physical_memory_read(pd_addr + l2 * 8, &pde, 8); + cpu_physical_memory_read_debug(pd_addr + l2 * 8, &pde, 8); pde = le64_to_cpu(pde); end = (l1 << 30) + (l2 << 21); if (pde & PG_PRESENT_MASK) { @@ -332,7 +333,8 @@ static void mem_info_pae32(Monitor *mon, CPUArchState *env) } else { pt_addr = pde & 0x3fffffffff000ULL; for (l3 = 0; l3 < 512; l3++) { - cpu_physical_memory_read(pt_addr + l3 * 8, &pte, 8); + cpu_physical_memory_read_debug(pt_addr + l3 * 8, + &pte, 8); pte = le64_to_cpu(pte); end = (l1 << 30) + (l2 << 21) + (l3 << 12); if (pte & PG_PRESENT_MASK) { @@ -371,13 +373,13 @@ static void mem_info_la48(Monitor *mon, CPUArchState *env) last_prot = 0; start = -1; for (l1 = 0; l1 < 512; l1++) { - cpu_physical_memory_read(pml4_addr + l1 * 8, &pml4e, 8); + cpu_physical_memory_read_debug(pml4_addr + l1 * 8, &pml4e, 8); pml4e = le64_to_cpu(pml4e); end = l1 << 39; if (pml4e & PG_PRESENT_MASK) { pdp_addr = pml4e & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { - cpu_physical_memory_read(pdp_addr + l2 * 8, &pdpe, 8); + cpu_physical_memory_read_debug(pdp_addr + l2 * 8, &pdpe, 8); pdpe = le64_to_cpu(pdpe); end = (l1 << 39) + (l2 << 30); if (pdpe & PG_PRESENT_MASK) { @@ -389,7 +391,8 @@ static void mem_info_la48(Monitor *mon, CPUArchState *env) } else { pd_addr = pdpe & 0x3fffffffff000ULL; for (l3 = 0; l3 < 512; l3++) { - cpu_physical_memory_read(pd_addr + l3 * 8, &pde, 8); + cpu_physical_memory_read_debug(pd_addr + l3 * 8, + &pde, 8); pde = le64_to_cpu(pde); end = (l1 << 39) + (l2 << 30) + (l3 << 21); if (pde & PG_PRESENT_MASK) { @@ -401,9 +404,9 @@ static void mem_info_la48(Monitor *mon, CPUArchState *env) } else { pt_addr = pde & 0x3fffffffff000ULL; for (l4 = 0; l4 < 512; l4++) { - cpu_physical_memory_read(pt_addr - + l4 * 8, - &pte, 8); + cpu_physical_memory_read_debug(pt_addr + + l4 * 8, + &pte, 8); pte = le64_to_cpu(pte); end = (l1 << 39) + (l2 << 30) + (l3 << 21) + (l4 << 12); @@ -448,7 +451,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) last_prot = 0; start = -1; for (l0 = 0; l0 < 512; l0++) { - cpu_physical_memory_read(pml5_addr + l0 * 8, &pml5e, 8); + cpu_physical_memory_read_debug(pml5_addr + l0 * 8, &pml5e, 8); pml5e = le64_to_cpu(pml5e); end = l0 << 48; if (!(pml5e & PG_PRESENT_MASK)) { @@ -459,7 +462,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) pml4_addr = pml5e & 0x3fffffffff000ULL; for (l1 = 0; l1 < 512; l1++) { - cpu_physical_memory_read(pml4_addr + l1 * 8, &pml4e, 8); + cpu_physical_memory_read_debug(pml4_addr + l1 * 8, &pml4e, 8); pml4e = le64_to_cpu(pml4e); end = (l0 << 48) + (l1 << 39); if (!(pml4e & PG_PRESENT_MASK)) { @@ -470,7 +473,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) pdp_addr = pml4e & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { - cpu_physical_memory_read(pdp_addr + l2 * 8, &pdpe, 8); + cpu_physical_memory_read_debug(pdp_addr + l2 * 8, &pdpe, 8); pdpe = le64_to_cpu(pdpe); end = (l0 << 48) + (l1 << 39) + (l2 << 30); if (pdpe & PG_PRESENT_MASK) { @@ -489,7 +492,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) pd_addr = pdpe & 0x3fffffffff000ULL; for (l3 = 0; l3 < 512; l3++) { - cpu_physical_memory_read(pd_addr + l3 * 8, &pde, 8); + cpu_physical_memory_read_debug(pd_addr + l3 * 8, &pde, 8); pde = le64_to_cpu(pde); end = (l0 << 48) + (l1 << 39) + (l2 << 30) + (l3 << 21); if (pde & PG_PRESENT_MASK) { @@ -508,7 +511,8 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) pt_addr = pde & 0x3fffffffff000ULL; for (l4 = 0; l4 < 512; l4++) { - cpu_physical_memory_read(pt_addr + l4 * 8, &pte, 8); + cpu_physical_memory_read_debug(pt_addr + l4 * 8, + &pte, 8); pte = le64_to_cpu(pte); end = (l0 << 48) + (l1 << 39) + (l2 << 30) + (l3 << 21) + (l4 << 12);