From patchwork Tue Jul 4 09:54:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 9824463 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DC430602F0 for ; Tue, 4 Jul 2017 09:58:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CAD9128464 for ; Tue, 4 Jul 2017 09:58:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF9A328478; Tue, 4 Jul 2017 09:58:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 49544284D2 for ; Tue, 4 Jul 2017 09:58:22 +0000 (UTC) Received: from localhost ([::1]:40028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSKb7-0004E6-KU for patchwork-qemu-devel@patchwork.kernel.org; Tue, 04 Jul 2017 05:58:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSKXs-00025c-W8 for qemu-devel@nongnu.org; Tue, 04 Jul 2017 05:55:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSKXs-0000Yp-37 for qemu-devel@nongnu.org; Tue, 04 Jul 2017 05:55:01 -0400 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]:36795) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dSKXr-0000YZ-Ri for qemu-devel@nongnu.org; Tue, 04 Jul 2017 05:55:00 -0400 Received: by mail-lf0-x244.google.com with SMTP id f28so17186157lfi.3 for ; Tue, 04 Jul 2017 02:54:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aiv3S4c1iWhH+JYE8V/Mn2XqxpRqa06eTNsxnv7tT/I=; b=CT83TpB3N2tXA8KmrlqnkSvTJQ5hxoFeSH4Grz+Ka22Mwi6QDRGjgxukf70nTPgwkm C5OcMEv0e2NAvzLVmozwLONcWH3w6yYbG2/QfeFxmPq3UIoY27f+rMf/lHwcy538QkCB Seolgxms409r5dSGGgx2Lr8SApdQfLjvC3jT/L4MjAoG9ziUw1VzhUKTz3Ouk/y2k/yU bGz6shUtyQ94xsoziynKGbYmXkyP6iq/H6nx+GY+vDGFPoT07tmLa8umNSZZcgsRZwCQ 97B09OSoGXdLHk7+iGoKgDxH++Lt4QTjjzQgIWxkKxJ1TR/kEsnZM39keSDosC41tYqE 0ylQ== 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=aiv3S4c1iWhH+JYE8V/Mn2XqxpRqa06eTNsxnv7tT/I=; b=S5Libie4IIQ152cwdW0scV0E3QIGGOF4YisPd4ZgCYem5XLqrNoGtpAifaxPAh9U0T hs8PgEDGgH5y37kkeOoQXPcRoGnadWGV0PnBlKmTfw3oN+iS+ugCPbc+0Lr/XhU7gp2O fU458cr8m4LFPSKnIIFUyFXNIcHUqyFvmdmvljSVopnZOhK092zY9Yi1ihcOYeiKIryn WSoZIQ2CaTXLmsECJh9OnDh5oPofkSxofYFKlmLHk5EFWjjiOxipBopzXum1+H1TLhqi Bz3C4AkzaLWJjgT3Mvq641TPeH3RlUN+3mp1x2vJVtn6FBMepC6uEiEpCvnxrekyxyRH E1tw== X-Gm-Message-State: AKS2vOwiizE9wg5YvGf+8Vj1kIVo9n5gW51L2Wwx1cqxmbnHkzbQIrSH h0E2XA3eR8hNu7L7 X-Received: by 10.25.33.203 with SMTP id h194mr12884207lfh.81.1499162098250; Tue, 04 Jul 2017 02:54:58 -0700 (PDT) Received: from localhost (81-231-233-234-no56.tbcn.telia.com. [81.231.233.234]) by smtp.gmail.com with ESMTPSA id v196sm4862176lfa.16.2017.07.04.02.54.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jul 2017 02:54:57 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 4 Jul 2017 11:54:37 +0200 Message-Id: <1499162088-1562-7-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1499162088-1562-1-git-send-email-edgar.iglesias@gmail.com> References: <1499162088-1562-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::244 Subject: [Qemu-devel] [PULL v1 06/17] target-microblaze: Introduce a use-div property X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sai.pavan.boddu@xilinx.com, edgar.iglesias@xilinx.com, alistai@xilinx.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "Edgar E. Iglesias" Introduce a use-div property making division instructions optional. Reviewed-by: Alistair Francis Signed-off-by: Edgar E. Iglesias --- target/microblaze/cpu.c | 9 +++++---- target/microblaze/cpu.h | 1 + target/microblaze/translate.c | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index bae47b5..5bf2a29 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -150,8 +150,7 @@ static void mb_cpu_realizefn(DeviceState *dev, Error **errp) qemu_init_vcpu(cs); - env->pvr.regs[0] = PVR0_USE_DIV_MASK \ - | PVR0_USE_HW_MUL_MASK \ + env->pvr.regs[0] = PVR0_USE_HW_MUL_MASK \ | PVR0_USE_EXC_MASK \ | PVR0_USE_ICACHE_MASK \ | PVR0_USE_DCACHE_MASK; @@ -161,7 +160,6 @@ static void mb_cpu_realizefn(DeviceState *dev, Error **errp) | PVR2_I_LMB_MASK \ | PVR2_USE_MSR_INSTR \ | PVR2_USE_PCMP_INSTR \ - | PVR2_USE_DIV_MASK \ | PVR2_USE_HW_MUL_MASK \ | PVR2_USE_MUL64_MASK \ | PVR2_FPU_EXC_MASK \ @@ -181,6 +179,7 @@ static void mb_cpu_realizefn(DeviceState *dev, Error **errp) env->pvr.regs[0] |= (cpu->cfg.stackprot ? PVR0_SPROT_MASK : 0) | (cpu->cfg.use_fpu ? PVR0_USE_FPU_MASK : 0) | (cpu->cfg.use_barrel ? PVR0_USE_BARREL_MASK : 0) | + (cpu->cfg.use_div ? PVR0_USE_DIV_MASK : 0) | (cpu->cfg.use_mmu ? PVR0_USE_MMU_MASK : 0) | (cpu->cfg.endi ? PVR0_ENDI_MASK : 0) | (version_code << PVR0_VERSION_SHIFT) | @@ -188,7 +187,8 @@ static void mb_cpu_realizefn(DeviceState *dev, Error **errp) env->pvr.regs[2] |= (cpu->cfg.use_fpu ? PVR2_USE_FPU_MASK : 0) | (cpu->cfg.use_fpu > 1 ? PVR2_USE_FPU2_MASK : 0) | - (cpu->cfg.use_barrel ? PVR2_USE_BARREL_MASK : 0); + (cpu->cfg.use_barrel ? PVR2_USE_BARREL_MASK : 0) | + (cpu->cfg.use_div ? PVR2_USE_DIV_MASK : 0); env->pvr.regs[5] |= cpu->cfg.dcache_writeback ? PVR5_DCACHE_WRITEBACK_MASK : 0; @@ -236,6 +236,7 @@ static Property mb_properties[] = { */ DEFINE_PROP_UINT8("use-fpu", MicroBlazeCPU, cfg.use_fpu, 2), DEFINE_PROP_BOOL("use-barrel", MicroBlazeCPU, cfg.use_barrel, true), + DEFINE_PROP_BOOL("use-div", MicroBlazeCPU, cfg.use_div, true), DEFINE_PROP_BOOL("use-mmu", MicroBlazeCPU, cfg.use_mmu, true), DEFINE_PROP_BOOL("dcache-writeback", MicroBlazeCPU, cfg.dcache_writeback, false), diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index 2a4a65a..4397338 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -299,6 +299,7 @@ struct MicroBlazeCPU { uint32_t base_vectors; uint8_t use_fpu; bool use_barrel; + bool use_div; bool use_mmu; bool dcache_writeback; bool endi; diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 26b221c..afe4bd4 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -643,7 +643,7 @@ static void dec_div(DisasContext *dc) LOG_DIS("div\n"); if ((dc->cpu->env.pvr.regs[2] & PVR2_ILL_OPCODE_EXC_MASK) - && !((dc->cpu->env.pvr.regs[0] & PVR0_USE_DIV_MASK))) { + && !dc->cpu->cfg.use_div) { tcg_gen_movi_tl(cpu_SR[SR_ESR], ESR_EC_ILLEGAL_OP); t_gen_raise_exception(dc, EXCP_HW_EXCP); }