From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9457EC433DB for ; Thu, 25 Feb 2021 08:56:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D190D64DF3 for ; Thu, 25 Feb 2021 08:56:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D190D64DF3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFCRk-0007BJ-PA for qemu-devel@archiver.kernel.org; Thu, 25 Feb 2021 03:56:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFCR6-0006ig-Jj for qemu-devel@nongnu.org; Thu, 25 Feb 2021 03:55:52 -0500 Received: from mx2.suse.de ([195.135.220.15]:60810) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFCR4-0003Fa-Ta for qemu-devel@nongnu.org; Thu, 25 Feb 2021 03:55:52 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 289DFAAAE; Thu, 25 Feb 2021 08:55:49 +0000 (UTC) Subject: Re: [PATCH v22 16/17] i386: gdbstub: only write CR0/CR2/CR3/EFER for SOFTMMU To: Richard Henderson , Paolo Bonzini , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Eduardo Habkost , Peter Maydell , =?UTF-8?Q?Alex_Benn=c3=a9e?= References: <20210224133428.14071-1-cfontana@suse.de> <20210224133428.14071-17-cfontana@suse.de> From: Claudio Fontana Message-ID: Date: Thu, 25 Feb 2021 09:55:48 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=195.135.220.15; envelope-from=cfontana@suse.de; helo=mx2.suse.de X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Roman Bolshakov , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 2/25/21 5:19 AM, Richard Henderson wrote: > On 2/24/21 5:34 AM, Claudio Fontana wrote: >> Signed-off-by: Claudio Fontana >> Cc: Paolo Bonzini >> --- >> target/i386/gdbstub.c | 16 ++++++++++++++++ >> 1 file changed, 16 insertions(+) >> >> diff --git a/target/i386/gdbstub.c b/target/i386/gdbstub.c >> index 41e265fc67..9f505d6ee3 100644 >> --- a/target/i386/gdbstub.c >> +++ b/target/i386/gdbstub.c >> @@ -383,26 +383,38 @@ int x86_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) >> >> case IDX_CTL_CR0_REG: >> if (env->hflags & HF_CS64_MASK) { >> +#ifdef CONFIG_SOFTMMU >> cpu_x86_update_cr0(env, ldq_p(mem_buf)); >> +#endif >> return 8; >> } >> +#ifdef CONFIG_SOFTMMU >> cpu_x86_update_cr0(env, ldl_p(mem_buf)); >> +#endif >> return 4; > > It would be nice to do all these with rather less ifdefs. > And let's correctly use !CONFIG_USER_ONLY. > > Without adding more stubs, may I suggest a new helper: > > static target_ulong read_long_cs64(env, buf, len) > { > #ifdef TARGET_X86_64 > if (env->hflags & HF_CS64_MASK) { > *len = 8; > return ldq_p(buf); > } > #endif > *len = 4; > return ldl_p(buf); > } in the current code the #ifdef TARGET_x86_64 is not there. Is it safe to use everywhere? should we do a matching: static int gdb_read_reg_cs64(CPUX86State *env, GByteArray *buf, target_ulong val) { if ((env->hflags & HF_CS64_MASK) || GDB_FORCE_64) { return gdb_get_reg64(buf, val); } return gdb_get_reg32(buf, val); } ? Should we add the #ifdef TARGET_X86_64 here as well? Thanks, Claudio > > which, even by itself allows some cleanup in this function. > Then: > > case IDX_CTL_CR2_REG: > tmp = read_long_cs64(env, mem_buf, &len); > #ifndef CONFIG_USER_ONLY > env->cr[2] = tmp; > #endif > return len; > > which still has one ifdef, but not 2. > > > r~ >