From patchwork Thu Mar 26 19:31:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Robert Foley X-Patchwork-Id: 184888 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp459728ilr; Thu, 26 Mar 2020 12:52:56 -0700 (PDT) X-Google-Smtp-Source: ADFU+vumFex89Ki7QyxxlRyzVT/IVHFQKOYYgoZrDEcsEcSbxGhMIrQ5N8s+KrbfGk5un/EH5r5v X-Received: by 2002:ac8:3032:: with SMTP id f47mr10263511qte.273.1585252376034; Thu, 26 Mar 2020 12:52:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585252376; cv=none; d=google.com; s=arc-20160816; b=UA27jZuI08ZmgerD/nipbmCcJj9NiZf0uQLjaZPW7WW0kzDbMGU/D7B7alX96qyj8v qgFCfNFDdLoVVq472dJ+wVtvjacL5o0BgNTM+rbtdsT8h1C+QdNMaeWqr34iEbS83Ouu l27X2C5EFkq5kAcvOi0pGUWfRScnBaOB9Y01aRMRqhFplKE3N3qGFUyXSFj2MRRureGu 8won5nawiLW71pShRQ3i4BueGXd9iZVE+gGGKynKADqny79sBYYE0gj7ViVCSGxXSu01 zyxrvoIKltB8fKESPG2gW6Hp8fysXEN+YRR7coitrSiBCVTU5Z5PYZv6Ug5o+CRv8d+W Y0bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=q7qiUjPB4OVFC6Nc1RwuXN27rGhJZIJuTp+ATKDGV+A=; b=K+cNDvwC5exFP4GrsobB8hEwFpCthWrWedLM8cAzyMABBfn2JxXZLaRIH/ZacDINQl QhhIHSx4pxzP4j0cVNgBRHWASjLYtzhpTwtx0h3WIBSdtQsbMh0qtZVdsXjSXXj5SKHd pY1bKOiIwkFbIABctFnpMqVRIYOeu2+7ZvfJFzNg+dipOhif8T0n0IZ8VRb0ZBM/B2Mk 4Q+5YlFle5sKe1puN4qlNt+Z4IepHcYZo6/ebSWSE8g1xHm8GRbKgT4LOuCeusSx8t8I hAJADVxjPMD00N7r/+jGCSwOQdqc/ytdc/t9T3AxJCvVAGzIz7/RgUqlYcYd8jB6DBxn NTMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=r8UvewTh; 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=fail (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 s19si2045502qth.161.2020.03.26.12.52.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Mar 2020 12:52:56 -0700 (PDT) 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=fail header.i=@linaro.org header.s=google header.b=r8UvewTh; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHYYh-0008QD-J2 for patch@linaro.org; Thu, 26 Mar 2020 15:52:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58779) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHYKW-00077z-Pp for qemu-devel@nongnu.org; Thu, 26 Mar 2020 15:38:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHYKV-0001gi-AU for qemu-devel@nongnu.org; Thu, 26 Mar 2020 15:38:16 -0400 Received: from mail-qk1-x743.google.com ([2607:f8b0:4864:20::743]:33743) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHYKT-0001fq-10 for qemu-devel@nongnu.org; Thu, 26 Mar 2020 15:38:14 -0400 Received: by mail-qk1-x743.google.com with SMTP id v7so8218769qkc.0 for ; Thu, 26 Mar 2020 12:38:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=q7qiUjPB4OVFC6Nc1RwuXN27rGhJZIJuTp+ATKDGV+A=; b=r8UvewThY0KQJHHMG6Q7j92v+zicuYppLY6AJheeJhCqo9c+W2CB0QS9ybHrzM8n/A M/3btWDf3nXluunlcbB9oIhjPtR3hqKCvf/aGDIao9zisD6KI14Wg0qFf+8OYN+OSYwr 2PMoAdU9VAfhrAeQBya8GfSU7z91iZEyZnJRgu/dM/zOJcL/+uJ0AQQ71IJ0HxaYQMZi xzFJzIt2NRniwrHTOJlbBqIcXfl33V83fY/iKwzrBvhoX7d/Yq67cKz96uGsOn5Pf+cU JogpFpLfCtheBYO3Q8MEIyxuqz+jlyg6wigPV7HekD2phWw1AIagqbJ0hfa7G/GdBuDL /Wtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=q7qiUjPB4OVFC6Nc1RwuXN27rGhJZIJuTp+ATKDGV+A=; b=cE7ru/8cM+dQ/UFkkIfIArL4O+Rs3FEfzHiZz37wv73i4unU6aUxo1cLYMrNceFItw Dfat2BZVvdBq1O+u1i2d788pU8TaUz6hDbQIYZ0kOasioBDqu0z31skZ6y8MK8GTdfqy PDr01SD+htQCz4lQmj5FRDWv44En4Z15VEXjEnELg5ty/lwcSFkEPXPZBWmO6vbk30zz HCgN3P5THgmikNzk1NrHpSQvm6Gy23ow1NQ/NGRc4plPWKJbMpi95m336XfxYTPnwKUP C2qtOJL5WMCKXzEeJ3x8knhUnZ8ixostEMxUnnSIHlclZigJBBRTK+2bTXOwaOvvWE7Y ulwQ== X-Gm-Message-State: ANhLgQ1rJHBVGL7YJkuNlPdxSKvgogr5na0zpT/4kbp1qB3yJGshxPxW gdfRUodlI588e2d7et90/DsDgxW2tW7G3A== X-Received: by 2002:a37:b986:: with SMTP id j128mr10011053qkf.109.1585251492121; Thu, 26 Mar 2020 12:38:12 -0700 (PDT) Received: from Rfoley-MA01.hsd1.ma.comcast.net ([2601:199:4480:60c0:fd55:4e67:1038:8302]) by smtp.gmail.com with ESMTPSA id u51sm2161916qth.46.2020.03.26.12.38.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2020 12:38:11 -0700 (PDT) From: Robert Foley To: qemu-devel@nongnu.org Subject: [PATCH v8 28/74] xtensa: convert to cpu_halted Date: Thu, 26 Mar 2020 15:31:10 -0400 Message-Id: <20200326193156.4322-29-robert.foley@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200326193156.4322-1-robert.foley@linaro.org> References: <20200326193156.4322-1-robert.foley@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::743 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: robert.foley@linaro.org, richard.henderson@linaro.org, Max Filippov , "Emilio G. Cota" , peter.puhov@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" Cc: Max Filippov Reviewed-by: Richard Henderson Reviewed-by: Alex Bennée Signed-off-by: Emilio G. Cota Signed-off-by: Robert Foley --- target/xtensa/cpu.c | 2 +- target/xtensa/exc_helper.c | 2 +- target/xtensa/helper.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index 82c2ee0679..fda4a73722 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -102,7 +102,7 @@ static void xtensa_cpu_reset(DeviceState *dev) #ifndef CONFIG_USER_ONLY reset_mmu(env); - s->halted = env->runstall; + cpu_halted_set(s, env->runstall); #endif } diff --git a/target/xtensa/exc_helper.c b/target/xtensa/exc_helper.c index 601341d13a..01d1e56feb 100644 --- a/target/xtensa/exc_helper.c +++ b/target/xtensa/exc_helper.c @@ -115,7 +115,7 @@ void HELPER(waiti)(CPUXtensaState *env, uint32_t pc, uint32_t intlevel) return; } - cpu->halted = 1; + cpu_halted_set(cpu, 1); HELPER(exception)(env, EXCP_HLT); } diff --git a/target/xtensa/helper.c b/target/xtensa/helper.c index 376a61f339..d5d5ad5899 100644 --- a/target/xtensa/helper.c +++ b/target/xtensa/helper.c @@ -327,7 +327,7 @@ void xtensa_runstall(CPUXtensaState *env, bool runstall) CPUState *cpu = env_cpu(env); env->runstall = runstall; - cpu->halted = runstall; + cpu_halted_set(cpu, runstall); if (runstall) { cpu_interrupt(cpu, CPU_INTERRUPT_HALT); } else {