From patchwork Tue Aug 25 20:59:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 248286 Delivered-To: patch@linaro.org Received: by 2002:a17:906:6447:0:0:0:0 with SMTP id l7csp4873ejn; Tue, 25 Aug 2020 14:14:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJymcAHaSHbQoHQG1+bU5ZdSsiK+uQR6VjaY4101zRTpLi6+r/mlrrAbZIFuU/a8sTE+YdF5 X-Received: by 2002:a05:6902:511:: with SMTP id x17mr16203825ybs.66.1598390083885; Tue, 25 Aug 2020 14:14:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598390083; cv=none; d=google.com; s=arc-20160816; b=LSYJu1+RRLo8spnrjbIdeOH0RKIV804+24J5//VdcHcM5Ghb8aesR65ant53tgwIj3 J5IiefSaC+Pwl44xuLRaiwcJw6+NXp0rjWAKlPnmYukOTpqvAlg4PKKzKWH1a9J2pJ4b GiAdEkkuvxnMaOrtSTRMt4DY9y4ZRfxN/XD2GC0immBb9gomNxXXoipt4Ulf1eAKyReg nJ1E3tmOUWp3igm0F6mShtumHgONai8KB/xanLKNd3BFWwgr9XBrSUSW8a0eoqhQBWNP pHXyLNbRJ9E8huj2TzmuomzQ1R4WRJdkdPeryGIt5mvRyW9verhxeBCDfwhSB4IZrq4L ygig== 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=bQC2NsHcUulzW6D5RhH+hzBIgYR+xbZNPdmPEiO9k08=; b=aepq7ZVAtpsVrEdin/Ja35CsQLAQwRVVSLlXXXRw2Z2vgILQzmZ0BZ+J+E3rHWnAkk 35wnfqmHzJISZUxlLEnVkvHgiQXfKN2+aNQj5sS0Cqxj6yXRQbNCAYZFbcqi7Or4P+Pe CDrr2TvcLus+4vA0DAeLu+UksOJYAqEun1QEUyxJYdflHqaIrWKOEOGkzopQXMBacihi R+vZaCY5iDMtnZFIltQwFQOwfa89wQujtzyL905OtPDFzrpvSuY+WtPCeb9IhJesSqFq /HTdbcM7Tuk1JpKTurm8E6mWMVKxaM9BE/E6u0z34ngX1Gr03ENbTA7EFG+TSJYeG/QS g2Aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QlQW0mth; 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 e8si45848ybq.133.2020.08.25.14.14.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Aug 2020 14:14:43 -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=pass header.i=@linaro.org header.s=google header.b=QlQW0mth; 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]:35712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAgHD-0002tZ-7U for patch@linaro.org; Tue, 25 Aug 2020 17:14:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAg3m-0008E5-15 for qemu-devel@nongnu.org; Tue, 25 Aug 2020 17:00:50 -0400 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:35166) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAg3j-0001t7-ST for qemu-devel@nongnu.org; Tue, 25 Aug 2020 17:00:49 -0400 Received: by mail-pf1-x441.google.com with SMTP id k1so1455803pfu.2 for ; Tue, 25 Aug 2020 14:00:47 -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=bQC2NsHcUulzW6D5RhH+hzBIgYR+xbZNPdmPEiO9k08=; b=QlQW0mthP7k6mEHQJjzG86WvF/cN8xdKjOgpDqAaksWh52IXrBrHdQtQiQOMbgCMA1 K20AGnts/TU1sEG0WneWRMxYI8aoJEF2SLU3nCqW4iCkFIZDMdK/kqOVgE5t2jpfhget drUViA2h9mtZRymTVVNJfTKVMhaHKw84LJN96OK9D/M10ppcDhnzpCe6lyqffpeScIEq BEUgoj5zlGrZLtxUYnTO7iJ4McZmTcfw/9j4a6JYwHDqZmZPrfVHKeEqw1Y22tN1QH+g g9oB6tgBZoNOo6lKloI2hAQF+bXO12vzGi07Yh3vA7RK9qqk9TDrxCG6kDQGt+GsJD9z VT8w== 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=bQC2NsHcUulzW6D5RhH+hzBIgYR+xbZNPdmPEiO9k08=; b=TIt7Ks7ek0YShkRSEDeltBCB4dIxe5J5eO1wPV9/V1YxmBX9awcBRCQ/WhgeiL0y5t EZNinra6c9eAAgUPw31+Dm7/HgacZuWUqfVDONKrHBZn7rIALQtlPxmxSQVNQ7OqJcBH EvCXaSb5VBsNP2CmyrJAoD8EHaaHn3QqTHbATpaHg3sXhFP+dTBF5OVGa4ITCy2LdkEC kbmKyLklIrhb5tdXwdR9lwCh+IGmREUnDEygs+UJKW/8FaQUUbCFIXgDA8XrD59H9SfV KIRunMOY8B7JaPAsVFC/4Ax8EvF8sR5RiArp+Dll4ttHAG4EgtrroqLYFKiWOgShZy4C 2yOw== X-Gm-Message-State: AOAM531VQoOd0c22wuTe/adrUI7ZeMzyc3eHT9E+hJiSjCGH07jlmBip y4vXHL7CwdTdYlYzz0F9mt4jd3B+e1gNIw== X-Received: by 2002:a62:1d05:: with SMTP id d5mr5505067pfd.63.1598389246141; Tue, 25 Aug 2020 14:00:46 -0700 (PDT) Received: from localhost.localdomain (h216-228-167-147.bendor.dedicated.static.tds.net. [216.228.167.147]) by smtp.gmail.com with ESMTPSA id k4sm16074pgr.87.2020.08.25.14.00.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 14:00:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 43/77] target/microblaze: Unwind properly when raising divide-by-zero Date: Tue, 25 Aug 2020 13:59:16 -0700 Message-Id: <20200825205950.730499-44-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200825205950.730499-1-richard.henderson@linaro.org> References: <20200825205950.730499-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::441; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x441.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=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: edgar.iglesias@gmail.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Restore the correct pc when raising divide-by-zero. Also, the MSR[DZO] bit is sticky -- it is not cleared with a successful divide. Signed-off-by: Richard Henderson --- target/microblaze/helper.h | 4 ++-- target/microblaze/op_helper.c | 23 ++++++++++++----------- 2 files changed, 14 insertions(+), 13 deletions(-) -- 2.25.1 diff --git a/target/microblaze/helper.h b/target/microblaze/helper.h index 6f7f96421f..79e1e8ecc7 100644 --- a/target/microblaze/helper.h +++ b/target/microblaze/helper.h @@ -1,7 +1,7 @@ DEF_HELPER_FLAGS_2(raise_exception, TCG_CALL_NO_WG, noreturn, env, i32) -DEF_HELPER_3(divs, i32, env, i32, i32) -DEF_HELPER_3(divu, i32, env, i32, i32) +DEF_HELPER_FLAGS_3(divs, TCG_CALL_NO_WG, i32, env, i32, i32) +DEF_HELPER_FLAGS_3(divu, TCG_CALL_NO_WG, i32, env, i32, i32) DEF_HELPER_3(fadd, i32, env, i32, i32) DEF_HELPER_3(frsub, i32, env, i32, i32) diff --git a/target/microblaze/op_helper.c b/target/microblaze/op_helper.c index f976d112eb..d99d98051a 100644 --- a/target/microblaze/op_helper.c +++ b/target/microblaze/op_helper.c @@ -69,26 +69,27 @@ void helper_raise_exception(CPUMBState *env, uint32_t index) cpu_loop_exit(cs); } -static inline int div_prepare(CPUMBState *env, uint32_t a, uint32_t b) +static bool check_divz(CPUMBState *env, uint32_t a, uint32_t b, uintptr_t ra) { - MicroBlazeCPU *cpu = env_archcpu(env); - - if (b == 0) { + if (unlikely(b == 0)) { env->msr |= MSR_DZ; - if ((env->msr & MSR_EE) && cpu->cfg.div_zero_exception) { + if ((env->msr & MSR_EE) && + env_archcpu(env)->cfg.div_zero_exception) { + CPUState *cs = env_cpu(env); + env->esr = ESR_EC_DIVZERO; - helper_raise_exception(env, EXCP_HW_EXCP); + cs->exception_index = EXCP_HW_EXCP; + cpu_loop_exit_restore(cs, ra); } - return 0; + return false; } - env->msr &= ~MSR_DZ; - return 1; + return true; } uint32_t helper_divs(CPUMBState *env, uint32_t a, uint32_t b) { - if (!div_prepare(env, a, b)) { + if (!check_divz(env, a, b, GETPC())) { return 0; } return (int32_t)a / (int32_t)b; @@ -96,7 +97,7 @@ uint32_t helper_divs(CPUMBState *env, uint32_t a, uint32_t b) uint32_t helper_divu(CPUMBState *env, uint32_t a, uint32_t b) { - if (!div_prepare(env, a, b)) { + if (!check_divz(env, a, b, GETPC())) { return 0; } return a / b;