From patchwork Wed Jun 17 21:01:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foley X-Patchwork-Id: 190914 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp802562ilo; Wed, 17 Jun 2020 14:10:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6ejnwpci9pVFwAtu7WGpqbr6IBsuOpZhQcq9iMHKcm53U1R2umUPmr6q4U02ZrDzwE+zJ X-Received: by 2002:a25:ac1b:: with SMTP id w27mr1478109ybi.378.1592428247671; Wed, 17 Jun 2020 14:10:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592428247; cv=none; d=google.com; s=arc-20160816; b=gm27QjOEQwUs4fOGY0NBmyHc+4LUpCxve/06DBq9e9DOrVx4heRKLaVFdcCEtVfSEK wt7QEOwbt6eP9VXQLs1wVP74vt9XC6OVc7b7k4r12WW+Zwak6aPU2szpOKYPaTRKhW0D PV5KqAeY7SdREMaY2dyVaj5hEpHSI3XMH4IfF1SK8IWeQMU54Bh1HTT1ORmyGlarpUIN yMoLiT+rkKh4snHBY5c14lAgDBsaqusaqNky17rkD7fCpt8M/1SF7YwL4livlLo5kRCV Vl1vBQHlDhhVfCICpWOd8G/RJeoCsi8G/Sz+MNOx31aFyjZoW7Nwv8ztYwvnv3PVYmXX xQnA== 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:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=YemnOlklw+URp/aLKC6SFqz2X8HrxCoaaT+NwLjZldo=; b=M5N/R9/bMsMARaEXOKnmzHtvkc/scerX7+NPe9QxSdOCjdpTIXwuiU0rZdV5qYLPh9 +90SXTXKm6vk/IKADu2Vmlcd2JySCwf22Hb/oLKv05DIjUVOJddFGZA3brLHu7SWn3lr +M1C8P+UyvVrWSQhVMG1RSjJ1dnJwhNEFvmCKxW0aFiQQg4+X0o0D7Z9f5VfWzHorfgU Wu1DLf1QqqkgPdOS4p+yQDAB/c9qEuyMQ1k3nkA/WRZEBz459m4nZN/mcY0ByjYLmeAq 4NZYMs41X/o1gp6p9VwBsR2Ln2dUUg3FNl1fIVenrJfE7De01SDbXunDkc61fVyEwHMU 2baA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EaXicV2S; 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 p123si607025ybg.360.2020.06.17.14.10.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jun 2020 14:10:47 -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=EaXicV2S; 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]:33402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlfKZ-0005px-0e for patch@linaro.org; Wed, 17 Jun 2020 17:10:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlfE1-0003EU-4C for qemu-devel@nongnu.org; Wed, 17 Jun 2020 17:04:05 -0400 Received: from mail-qt1-x842.google.com ([2607:f8b0:4864:20::842]:44349) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlfDt-0008UW-Pi for qemu-devel@nongnu.org; Wed, 17 Jun 2020 17:04:00 -0400 Received: by mail-qt1-x842.google.com with SMTP id c12so2730052qtq.11 for ; Wed, 17 Jun 2020 14:03:51 -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; bh=YemnOlklw+URp/aLKC6SFqz2X8HrxCoaaT+NwLjZldo=; b=EaXicV2SrI+jZc6jXA3EYsKOVyBml4iIwvFptjrgJSaDZTl1CxdsgLEDDrg+OTstid /p0bJ/ZhZckKfDS983OAVfF+wUVE7MwWOnt9zISrGsGAI0TdgZXjmtuZAkylfJPmuJCN rWV4jZmZvFyKeJ69TKoVLZO7ID9PNOqbFiQyfE7oNgXwzNxvShyC7SRsUU+wWv3dhOxC yRjfgEL1vTFweXxAEIsGR4Sy6ca4YsqjFEIcU7Fb2ifqarqgxi09BpQSMBdIr1A9I8As u+47cOCFkkr0RBF25khfp7+zOR4Xh0ga3ykD7odaen/IwSoFIRliyhzHsQkAhSo9Ul7J 0enA== 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; bh=YemnOlklw+URp/aLKC6SFqz2X8HrxCoaaT+NwLjZldo=; b=Es6jOgL5zJbCXNpPjAhS9+OrpTaUwo9ZL9YyW0sCGjN4fHnTQ1ox4J+neeMg1W0NGA QhRpqksYIUH6GFeU7XlPKrr+BplvSiYVw/uIirxK2Q/exOyqJ6WB+3Qa5NRv1eW8UwHD t3UOmqzrCVLtgnt+HgIL7wuPyKEZH1YCawU1mPa9L3Ru2/hPTZFNQXxVZ5p6ztXlFuYS C0+s98Lfga7Eg+DelaI7ObFkpqG31sjBq2CBdcqUlpCAEvj1HBQSB/Uy3DZyWm08pZ5q 0m1IeVBHBYk142+Vh/ixyI35hRjmwsTXuH3lgjV4Eg/HDtpmNb5JRxL60oQlHcptkK30 dd7Q== X-Gm-Message-State: AOAM533bHK+QKolMnwzfcxiwKEq8GAeKluGEf7pyZRa7UsVEPRFzAMpP 1Nl5fJ4lhgT5SWm7ZsVca9aXRfj0BMs4xA== X-Received: by 2002:aed:35fa:: with SMTP id d55mr1054590qte.385.1592427830871; Wed, 17 Jun 2020 14:03:50 -0700 (PDT) Received: from Rfoley-MA01.hsd1.ma.comcast.net ([2601:199:4480:60c0:fc79:714c:9711:2e9c]) by smtp.gmail.com with ESMTPSA id w13sm997245qkb.91.2020.06.17.14.03.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 14:03:50 -0700 (PDT) From: Robert Foley To: qemu-devel@nongnu.org Subject: [PATCH v10 24/73] riscv: convert to cpu_halted Date: Wed, 17 Jun 2020 17:01:42 -0400 Message-Id: <20200617210231.4393-25-robert.foley@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200617210231.4393-1-robert.foley@linaro.org> References: <20200617210231.4393-1-robert.foley@linaro.org> Received-SPF: pass client-ip=2607:f8b0:4864:20::842; envelope-from=robert.foley@linaro.org; helo=mail-qt1-x842.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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=_AUTOLEARN 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: Alistair Francis , "open list:RISC-V TCG CPUs" , robert.foley@linaro.org, Sagar Karandikar , Bastian Koppelmann , cota@braap.org, Palmer Dabbelt , 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: Sagar Karandikar Cc: Bastian Koppelmann Reviewed-by: Palmer Dabbelt Reviewed-by: Richard Henderson Reviewed-by: Alistair Francis Signed-off-by: Emilio G. Cota Signed-off-by: Robert Foley --- target/riscv/op_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index b0c49efc4a..fe1373a95d 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -176,7 +176,7 @@ void helper_wfi(CPURISCVState *env) riscv_cpu_virt_enabled(env)) { riscv_raise_exception(env, RISCV_EXCP_ILLEGAL_INST, GETPC()); } else { - cs->halted = 1; + cpu_halted_set(cs, 1); cs->exception_index = EXCP_HLT; cpu_loop_exit(cs); }