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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 D1642C433ED for ; Mon, 19 Apr 2021 17:17:04 +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 54097611F0 for ; Mon, 19 Apr 2021 17:17:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 54097611F0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYXWB-0002Po-DI for qemu-devel@archiver.kernel.org; Mon, 19 Apr 2021 13:17:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYXOr-0001fL-TE for qemu-devel@nongnu.org; Mon, 19 Apr 2021 13:09:29 -0400 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]:46837) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYXOq-0006GB-7b for qemu-devel@nongnu.org; Mon, 19 Apr 2021 13:09:29 -0400 Received: by mail-ed1-x536.google.com with SMTP id h10so41609511edt.13 for ; Mon, 19 Apr 2021 10:09:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=0oIcR+jn+P5ZI6cd1tZwddKKZQ0GTahtJj53SbGnCNM=; b=f70HuaoiOIxUGUye/I4zQKkQJ2k+b7i8lIbk3aRej3EOLGX3/yzUm7tdtfJb66zm9b RR5djr3TRQRq+zk/TEwhRUKb3EUJzJJSPL1plTzhz7tvXBpYbvGRmytHQNMzAUNS8hn3 hOH2NQXbUxXhDvb4U9hPKDYxD5GYkKwHc32nKPm1NDVXMuhsquxcc0Wm+sJgp/RqL/Z5 iKMgiaClea+NMdUf62lIf7VInrgGVjD7pJaWlS0meJL2RdJCFSRnMroGW/jJHrHBpdkr ho96KXGxHBJt+YRTE8Djz8Mvt8OtwnMm1PAIHWbmfGe2USD14iPy7DqSvXg2NFT29dw/ keXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=0oIcR+jn+P5ZI6cd1tZwddKKZQ0GTahtJj53SbGnCNM=; b=t55YzB3ATasckd5MApdUCWgb2hwkTmRPVRmoW0kS3GLEciRFvOZGTWf4/tQqu+eoK3 g0Gv4k1WSSbxgk0esGzKK7zA4P2EZC2KrhgsK3ahcfUFUzkqdlPVSDYVCsrzFBXEqHD+ PWtLd7Vu7vCLAEF3N+xKG3PdlJrIkXZQaeifI7MV2dBBCXkXDo7FkwPlt8kfBVMJH5KQ XjihYt51tgIYUWH2lbf2QQFm4nOufwRQ/0olyWLOFGv/utH4baW1HEG9oYdWWyJgI/yo isriQrEJwj2SYed/5mPdxcxq//CdkDFJCkaT5BcRs7jgK1kQUOkA6UzZDU8SLVGGvYTD PTrw== X-Gm-Message-State: AOAM5321EL1MZYIc+JZVIrJkz87V2hCRhF60amuApwxPG1i1CBO+xAmx /VtaKET+1usR1+PoYzYtu/RPcsN837ZwoiI4MBy1oQ== X-Google-Smtp-Source: ABdhPJx05jkc/YDSj7o3c/tujN1pfIuVaCqRELLvkwLu78XH0q3O7gzb1Rgr0aaaNAAM39A45c9Amlx9DESnCx+0mTE= X-Received: by 2002:a05:6402:4244:: with SMTP id g4mr26823407edb.204.1618852166385; Mon, 19 Apr 2021 10:09:26 -0700 (PDT) MIME-Version: 1.0 References: <20210416185959.1520974-1-richard.henderson@linaro.org> <20210416185959.1520974-7-richard.henderson@linaro.org> In-Reply-To: <20210416185959.1520974-7-richard.henderson@linaro.org> From: Peter Maydell Date: Mon, 19 Apr 2021 18:08:35 +0100 Message-ID: Subject: Re: [PATCH v4 06/30] target/arm: Move mode specific TB flags to tb->cs_base To: Richard Henderson Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=peter.maydell@linaro.org; helo=mail-ed1-x536.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: qemu-arm , QEMU Developers Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, 16 Apr 2021 at 20:09, Richard Henderson wrote: > > Now that we have all of the proper macros defined, expanding > the CPUARMTBFlags structure and populating the two TB fields > is relatively simple. > > Signed-off-by: Richard Henderson > --- > target/arm/cpu.h | 49 ++++++++++++++++++++++++------------------ > target/arm/translate.h | 2 +- > target/arm/helper.c | 2 +- > 3 files changed, 30 insertions(+), 23 deletions(-) > > diff --git a/target/arm/translate.h b/target/arm/translate.h > index f30287e554..50c2aba066 100644 > --- a/target/arm/translate.h > +++ b/target/arm/translate.h > @@ -402,7 +402,7 @@ typedef void AtomicThreeOpFn(TCGv_i64, TCGv_i64, TCGv_i64, TCGArg, MemOp); > */ > static inline CPUARMTBFlags arm_tbflags_from_tb(const TranslationBlock *tb) > { > - return (CPUARMTBFlags){ tb->flags }; > + return (CPUARMTBFlags){ tb->flags, tb->cs_base }; > } > > /* > diff --git a/target/arm/helper.c b/target/arm/helper.c > index 9070b773a9..85b7d6add0 100644 > --- a/target/arm/helper.c > +++ b/target/arm/helper.c > @@ -13271,7 +13271,6 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, > { > CPUARMTBFlags flags; > > - *cs_base = 0; > assert_hflags_rebuild_correctly(env); > flags = env->hflags; > > @@ -13340,6 +13339,7 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, > } > > *pflags = flags.flags; > + *cs_base = flags.flags2; > } Don't you also need to make assert_hflags_rebuild_correctly() check flags2 now ? Otherwise Reviewed-by: Peter Maydell thanks -- PMM