From patchwork Tue Aug 27 00:07:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 172235 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp5048646ily; Mon, 26 Aug 2019 17:12:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqzBX/hL1sr7jlmR1ZUtwArp/HYSkjp9/Mu2bjIAyBDI3+CPv9EsaabD/PICpUo2UcePAsE3 X-Received: by 2002:a50:f1d7:: with SMTP id y23mr21927002edl.302.1566864722259; Mon, 26 Aug 2019 17:12:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566864722; cv=none; d=google.com; s=arc-20160816; b=xYRQcL0qtiGYg38ItA8C+6k0PdGSBHumP7W70pEv3QKM60hE0wczudpTh/EQOFcfst aBySJgfiaNOjT4TITM87oJHrkz0ct7yIsFiWVdpnOcuaalA6wTXwm0uT/tzuyNtluWed HJCFYsAP7yffHOarKVDr9qtVcVphxE9lDG5w1NLJOgYJEqe4zCyGXdZkaTncyzRCERld QhY5601eb+telBC+cQP5t43m63lTucrWhAd7Em/K7gJ1m52jK6KUw80SHIXAu/hUtlhk rDKRXnoJz/NOw8/fUOBcLatHdhG/lwhaqptCKeSlxibT/lQb4q6SdKmdcFN5MKYrqyYv 0JbA== 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:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=P5BKSBEw7Nldiu+d1jRkhqa/VjZEEGAgTd8xsmve4pQ=; b=fiSghj3MdG83SUZTswFywT1akice6tF3QPooXPpYfsXDvSoPzmcIcxRdrPc6tn3km8 IW37LSc8/h9sRvO6omDIl0HxTMrtBq1UVhmBGqDUv8gACcwvC3TjFnJzvT4PDuX8oOJ4 iNDRoi2ffnuqh777aN2u/6/JrvrllX0TNxM6IwOKu4Y4ccDFRu7acyzCCUGP68GB/Rir pXK27cxPx7FSOwnaDpFaSwNMlWKhSeiKDn4W2T1V1XsUD5euUUFIIB3JhdlF9+GUJu9e WktS0ugAcY1QaifC1qlgl0kGbrONoyIYpyUdfbYfzBmP3911GJtD9Mzk2/8Kz+kWRpoJ Uspg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=j3lu9Rf2; 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 by3si6381272ejb.307.2019.08.26.17.12.02 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Aug 2019 17:12:02 -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=j3lu9Rf2; 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]:58620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2P5c-00039z-MO for patch@linaro.org; Mon, 26 Aug 2019 20:12:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33670) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2P1l-00086R-CW for qemu-devel@nongnu.org; Mon, 26 Aug 2019 20:08:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i2P1i-00076i-TY for qemu-devel@nongnu.org; Mon, 26 Aug 2019 20:08:01 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:35295) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i2P1i-00076O-Ni for qemu-devel@nongnu.org; Mon, 26 Aug 2019 20:07:58 -0400 Received: by mail-pg1-x532.google.com with SMTP id n4so11577812pgv.2 for ; Mon, 26 Aug 2019 17:07:58 -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=P5BKSBEw7Nldiu+d1jRkhqa/VjZEEGAgTd8xsmve4pQ=; b=j3lu9Rf2eslfHuCIBf76WFwPT3QPq+sN3aadCv1th+oK6/2sD8KQzj5n/r+bgXs86n oAkESRiDsslCgxUxGygah84dPE5P6yyseXdz2QpvimYzRvWi1pg+o7kqepow1CEcMkqN 5YQFIMDPpZMiXZnUM+MXU83B2FNN7xRxlJz3HO3FG2B1K0yKMvhXT9Vrw5EqFtpXwKYV vpp0lG73JzkdhfxSgbeX7gdzGWM/UJqMPjhDVhwIsPbPG91PYeTsrWLVPn03WirDxrNT vPRmHb3gaNP/A18rBFSbcENCYpwuYNa9AxyOj9fh785cgQHGgejW+ZQyUDPGVqfsDyS9 j/yw== 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=P5BKSBEw7Nldiu+d1jRkhqa/VjZEEGAgTd8xsmve4pQ=; b=VHpw1vB0YJGIpPv53y0DMFkFafZCbIEc1u+lFj4aYD4jOKBBf3dCAG6tEdu5Rg4Iuz KrK4dFZ4as2bfoNNTf2nn3T95z9zNtfA7EyQW0Hx4tVjfTFVXJNXoIRaeXIKoJPvUlu9 PQVkpUjpkMdZ9gHlifr+iBvxFjrjbwwKjz2hZ2dgSqICZ9QEZPBCRyaguVsvTW0jWYBC sabT+H/YpKSOdHnDeLgI/2vf0J/DbPSSaQBD20S04nWfIzIb0OriaAB1Ko52NW0YA7d3 5ZGnlEuzPNfFh8LCVaC5XkEAxyvW8wYAd7UVr9q/Fh6dvNsRfQvRZH+Av7vjts4WcL7r oa9w== X-Gm-Message-State: APjAAAXLs007FXPVBRsJZkcKFWa/UkuTGvOdbScq8iyXlHKQ+rxtAFYy rKeX5NINVn6e9hcF7comb95m9PE/zl8= X-Received: by 2002:a63:5945:: with SMTP id j5mr18610994pgm.452.1566864477105; Mon, 26 Aug 2019 17:07:57 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id e189sm11691067pgc.15.2019.08.26.17.07.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 17:07:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 26 Aug 2019 17:07:40 -0700 Message-Id: <20190827000745.19645-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190827000745.19645-1-richard.henderson@linaro.org> References: <20190827000745.19645-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::532 Subject: [Qemu-devel] [PATCH 08/13] target/openrisc: Check CPUCFG_OF32S for float insns 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: shorne@gmail.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Make sure the OF32S insns are enabled before allowing execution. Include the missing bit for cpu "any". Signed-off-by: Richard Henderson --- target/openrisc/cpu.c | 2 +- target/openrisc/translate.c | 84 ++++++++++++++++--------------------- 2 files changed, 36 insertions(+), 50 deletions(-) -- 2.17.1 Reviewed-by: Stafford Horne diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c index 9f566ad883..f3c8134531 100644 --- a/target/openrisc/cpu.c +++ b/target/openrisc/cpu.c @@ -131,7 +131,7 @@ static void openrisc_any_initfn(Object *obj) cpu->env.avr = 0x01010000; /* Architecture v1.1 */ cpu->env.upr = UPR_UP | UPR_DMP | UPR_IMP | UPR_PICP | UPR_TTP | UPR_PMP; - cpu->env.cpucfgr = CPUCFGR_NSGF | CPUCFGR_OB32S | + cpu->env.cpucfgr = CPUCFGR_NSGF | CPUCFGR_OB32S | CPUCFGR_OF32S | CPUCFGR_AVRP | CPUCFGR_EVBARP; /* 1Way, TLB_SIZE entries. */ diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 37e8098023..faae979ae3 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -45,6 +45,7 @@ typedef struct DisasContext { uint32_t mem_idx; uint32_t tb_flags; uint32_t delayed_branch; + uint32_t cpucfgr; /* If not -1, jmp_pc contains this value and so is a direct jump. */ target_ulong jmp_pc_imm; @@ -140,30 +141,11 @@ static void gen_illegal_exception(DisasContext *dc) dc->base.is_jmp = DISAS_NORETURN; } -/* not used yet, open it when we need or64. */ -/*#ifdef TARGET_OPENRISC64 -static void check_ob64s(DisasContext *dc) +static bool check_of32s(DisasContext *dc) { - if (!(dc->flags & CPUCFGR_OB64S)) { - gen_illegal_exception(dc); - } + return dc->cpucfgr & CPUCFGR_OF32S; } -static void check_of64s(DisasContext *dc) -{ - if (!(dc->flags & CPUCFGR_OF64S)) { - gen_illegal_exception(dc); - } -} - -static void check_ov64s(DisasContext *dc) -{ - if (!(dc->flags & CPUCFGR_OV64S)) { - gen_illegal_exception(dc); - } -} -#endif*/ - static TCGv cpu_R(DisasContext *dc, int reg) { if (reg == 0) { @@ -1157,26 +1139,37 @@ static bool trans_l_rfe(DisasContext *dc, arg_l_rfe *a) return true; } -static void do_fp2(DisasContext *dc, arg_da *a, +static bool do_fp2(DisasContext *dc, arg_da *a, void (*fn)(TCGv, TCGv_env, TCGv)) { + if (!check_of32s(dc)) { + return false; + } check_r0_write(dc, a->d); fn(cpu_R(dc, a->d), cpu_env, cpu_R(dc, a->a)); gen_helper_update_fpcsr(cpu_env); + return true; } -static void do_fp3(DisasContext *dc, arg_dab *a, +static bool do_fp3(DisasContext *dc, arg_dab *a, void (*fn)(TCGv, TCGv_env, TCGv, TCGv)) { + if (!check_of32s(dc)) { + return false; + } check_r0_write(dc, a->d); fn(cpu_R(dc, a->d), cpu_env, cpu_R(dc, a->a), cpu_R(dc, a->b)); gen_helper_update_fpcsr(cpu_env); + return true; } -static void do_fpcmp(DisasContext *dc, arg_ab *a, +static bool do_fpcmp(DisasContext *dc, arg_ab *a, void (*fn)(TCGv, TCGv_env, TCGv, TCGv), bool inv, bool swap) { + if (!check_of32s(dc)) { + return false; + } if (swap) { fn(cpu_sr_f, cpu_env, cpu_R(dc, a->b), cpu_R(dc, a->a)); } else { @@ -1186,52 +1179,50 @@ static void do_fpcmp(DisasContext *dc, arg_ab *a, tcg_gen_xori_tl(cpu_sr_f, cpu_sr_f, 1); } gen_helper_update_fpcsr(cpu_env); + return true; } static bool trans_lf_add_s(DisasContext *dc, arg_dab *a) { - do_fp3(dc, a, gen_helper_float_add_s); - return true; + return do_fp3(dc, a, gen_helper_float_add_s); } static bool trans_lf_sub_s(DisasContext *dc, arg_dab *a) { - do_fp3(dc, a, gen_helper_float_sub_s); - return true; + return do_fp3(dc, a, gen_helper_float_sub_s); } static bool trans_lf_mul_s(DisasContext *dc, arg_dab *a) { - do_fp3(dc, a, gen_helper_float_mul_s); - return true; + return do_fp3(dc, a, gen_helper_float_mul_s); } static bool trans_lf_div_s(DisasContext *dc, arg_dab *a) { - do_fp3(dc, a, gen_helper_float_div_s); - return true; + return do_fp3(dc, a, gen_helper_float_div_s); } static bool trans_lf_rem_s(DisasContext *dc, arg_dab *a) { - do_fp3(dc, a, gen_helper_float_rem_s); + return do_fp3(dc, a, gen_helper_float_rem_s); return true; } static bool trans_lf_itof_s(DisasContext *dc, arg_da *a) { - do_fp2(dc, a, gen_helper_itofs); - return true; + return do_fp2(dc, a, gen_helper_itofs); } static bool trans_lf_ftoi_s(DisasContext *dc, arg_da *a) { - do_fp2(dc, a, gen_helper_ftois); - return true; + return do_fp2(dc, a, gen_helper_ftois); } static bool trans_lf_madd_s(DisasContext *dc, arg_dab *a) { + if (!check_of32s(dc)) { + return false; + } check_r0_write(dc, a->d); gen_helper_float_madd_s(cpu_R(dc, a->d), cpu_env, cpu_R(dc, a->d), cpu_R(dc, a->a), cpu_R(dc, a->b)); @@ -1241,38 +1232,32 @@ static bool trans_lf_madd_s(DisasContext *dc, arg_dab *a) static bool trans_lf_sfeq_s(DisasContext *dc, arg_ab *a) { - do_fpcmp(dc, a, gen_helper_float_eq_s, false, false); - return true; + return do_fpcmp(dc, a, gen_helper_float_eq_s, false, false); } static bool trans_lf_sfne_s(DisasContext *dc, arg_ab *a) { - do_fpcmp(dc, a, gen_helper_float_eq_s, true, false); - return true; + return do_fpcmp(dc, a, gen_helper_float_eq_s, true, false); } static bool trans_lf_sfgt_s(DisasContext *dc, arg_ab *a) { - do_fpcmp(dc, a, gen_helper_float_lt_s, false, true); - return true; + return do_fpcmp(dc, a, gen_helper_float_lt_s, false, true); } static bool trans_lf_sfge_s(DisasContext *dc, arg_ab *a) { - do_fpcmp(dc, a, gen_helper_float_le_s, false, true); - return true; + return do_fpcmp(dc, a, gen_helper_float_le_s, false, true); } static bool trans_lf_sflt_s(DisasContext *dc, arg_ab *a) { - do_fpcmp(dc, a, gen_helper_float_lt_s, false, false); - return true; + return do_fpcmp(dc, a, gen_helper_float_lt_s, false, false); } static bool trans_lf_sfle_s(DisasContext *dc, arg_ab *a) { - do_fpcmp(dc, a, gen_helper_float_le_s, false, false); - return true; + return do_fpcmp(dc, a, gen_helper_float_le_s, false, false); } static void openrisc_tr_init_disas_context(DisasContextBase *dcb, CPUState *cs) @@ -1284,6 +1269,7 @@ static void openrisc_tr_init_disas_context(DisasContextBase *dcb, CPUState *cs) dc->mem_idx = cpu_mmu_index(env, false); dc->tb_flags = dc->base.tb->flags; dc->delayed_branch = (dc->tb_flags & TB_FLAGS_DFLAG) != 0; + dc->cpucfgr = env->cpucfgr; dc->jmp_pc_imm = -1; bound = -(dc->base.pc_first | TARGET_PAGE_MASK) / 4;