From patchwork Wed Mar 1 02:56:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 657748 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3269484wrb; Tue, 28 Feb 2023 18:58:50 -0800 (PST) X-Google-Smtp-Source: AK7set+7BsDkfFouZ2ej6DJNGAWXSx4GJG6hGl47I6tHR6OW68igZdYMTbrX9AuHzWyTAqC7IcLO X-Received: by 2002:a05:6214:1244:b0:56f:87f:d92c with SMTP id r4-20020a056214124400b0056f087fd92cmr9806384qvv.0.1677639530527; Tue, 28 Feb 2023 18:58:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677639530; cv=none; d=google.com; s=arc-20160816; b=QJM5YnfeBT/jy29ng/mOqE1mbuuDjCPNSA/sM0H61TviVLJvJSzjUYSZDw9EFp9NIo LuiUo0hY2h68O5SEGRy8Tn854r+K3RQNtjdkjxH8somGVz32BPoTjnyp5lW3OWa3rza3 gQLNCOrvR2b6q2I/XnoZb2KGzqAkWLXCnvGqzIbTqJ1+bG0AtBmdLq32Q5e6stRBWm0R vUYXrw5P4k9UvGY8atPyr2OBZY8HlrG5+hZbwGEkm+rz4TAoFNyXmvDg1DitoM7Njmri kqVDsEhfvfdxuIpO7pEK7zXjQq23FPVkB2JvENpRyDgLNEfgoSTNZM4MK2HzYFU3XE0V K/gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jO9J5Uj0jM0Y57wfqI1JL5b+bwRf/M4zfej3HsUyqb4=; b=q07kmo8LyvQQRItEXLPnGtAnvSQsvZp7RCi53mas4kJ9iyd5st5w5VjvOrB+cbyYog hnbBuvjX5j207yGVT1gVfLuh0NuS7ZTwLJAToDES+1QfbU7w5c2girvgj+SNBq+3Eaoi 9D+aal99qZGb1CME7GrZhY1iZZ8ixQRrMfEZM67Gs/YfBINf2w9+r3+5cTp1fzX1GOBr 9Kll5JpEPh0FSM9yr85kXNN74ebMJ6sEWMps3PyNEK1xiSVruV/DP/c5ywENimWk2yZA a4U2eSUz2mo9gDZIdGruvv4K7wk+nMAIi0Ah+iZ6h/B0dpnWo6WMfglibW68qsGpavno y3DA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OLSg28xp; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 203-20020a3706d4000000b007067470045csi9543088qkg.21.2023.02.28.18.58.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 18:58:50 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OLSg28xp; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXCf4-0001oV-RU; Tue, 28 Feb 2023 21:57:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXCew-00018G-FP for qemu-devel@nongnu.org; Tue, 28 Feb 2023 21:57:38 -0500 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXCeu-0003Fc-Vw for qemu-devel@nongnu.org; Tue, 28 Feb 2023 21:57:38 -0500 Received: by mail-pl1-x62a.google.com with SMTP id a2so2121238plm.4 for ; Tue, 28 Feb 2023 18:57:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jO9J5Uj0jM0Y57wfqI1JL5b+bwRf/M4zfej3HsUyqb4=; b=OLSg28xpZC7hPpm11ROV/qu520akBLzSNBIltG9jD0rX7GU5714TRhtnUqFfWixluv y/gvPDanQhLh8KIGhg2EE1QiZtlCByUvQxBdxmDpvrrbr/cqvGh+8bxvh5mLYXMpWXT8 DSu63DkQh2U607OAsPES6lqKfJ0igvZSuHtooOR1CcHp7UFI01jLZGMB8vDhzB8+ZWci HgV0cfjBSjboQnjoRWxA26qXJNc0xo4UiBkM8+eown6amdS3mRtuIi6U4nneFDrA4Nep K5cuxcKRpyTxd/GBwlWzC3D0lS+uI7/IlgH+eVQRKNUk1BCBbbAAs+6fR2q1vNjBIjMn euzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jO9J5Uj0jM0Y57wfqI1JL5b+bwRf/M4zfej3HsUyqb4=; b=LQb97p+LbBDZekZohshv1/F/OTqel9NDuOXKVIhWAxl5Yp8f21QYgGCSSAJvqm9x7a iPRtQ19s7K3U3Qg8h0ZWm3XlBLHGSIedfznULiVDcHhUI8YUtqRVGKmtVwA3V6oDOFkk iOcsJGWC38f7kGLkS8EsoH3LMUojLM7eznSG9HOlM/2wKEpJymzFVztB0EuH1u2GJtJg Da7+5qqEI0rnrvf9/pciYwsM2pibAS+GPIDQxzgOKBzJ/tcjFTRjG+K8f8y1PdSPRZtV L25qD2rWRGTW74oeNkO2Zn46gXcf/t/FCrnzg/+hF+W7XennCMsghKx6o8vDkSEOopfn DTRg== X-Gm-Message-State: AO0yUKXLuxtgAJkUh5stjVMpsDa/tFRaw0JZr3GewZ8jJSNQdP1Q+MWC e07RKcK9h81VSqUnOKU+PA4401N8GYd8bXcK8zw= X-Received: by 2002:a17:902:ab49:b0:19c:e440:924c with SMTP id ij9-20020a170902ab4900b0019ce440924cmr4540266plb.47.1677639456268; Tue, 28 Feb 2023 18:57:36 -0800 (PST) Received: from stoup.. (rrcs-173-198-77-218.west.biz.rr.com. [173.198.77.218]) by smtp.gmail.com with ESMTPSA id jg15-20020a17090326cf00b0019adbef6a63sm7210120plb.235.2023.02.28.18.57.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 18:57:35 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Anton Johansson , =?utf-8?q?Phili?= =?utf-8?q?ppe_Mathieu-Daud=C3=A9?= Subject: [PULL 29/62] target/avr: Replace `tb_pc()` with `tb->pc` Date: Tue, 28 Feb 2023 16:56:10 -1000 Message-Id: <20230301025643.1227244-30-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230301025643.1227244-1-richard.henderson@linaro.org> References: <20230301025643.1227244-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Anton Johansson via Signed-off-by: Anton Johansson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230227135202.9710-26-anjo@rev.ng> Signed-off-by: Richard Henderson --- target/avr/cpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/avr/cpu.c b/target/avr/cpu.c index d0139804b9..a24c23c247 100644 --- a/target/avr/cpu.c +++ b/target/avr/cpu.c @@ -54,7 +54,8 @@ static void avr_cpu_synchronize_from_tb(CPUState *cs, AVRCPU *cpu = AVR_CPU(cs); CPUAVRState *env = &cpu->env; - env->pc_w = tb_pc(tb) / 2; /* internally PC points to words */ + tcg_debug_assert(!(cs->tcg_cflags & CF_PCREL)); + env->pc_w = tb->pc / 2; /* internally PC points to words */ } static void avr_restore_state_to_opc(CPUState *cs,