From patchwork Thu Apr 30 10:19:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 283721 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7D43C8300B for ; Thu, 30 Apr 2020 10:21:26 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 75C5520787 for ; Thu, 30 Apr 2020 10:21:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="k2uRwX9O" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 75C5520787 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU6Jp-0001i5-Jc for qemu-devel@archiver.kernel.org; Thu, 30 Apr 2020 06:21:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52418) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU6IV-0008Aw-BU for qemu-devel@nongnu.org; Thu, 30 Apr 2020 06:20:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jU6IO-000172-4p for qemu-devel@nongnu.org; Thu, 30 Apr 2020 06:20:02 -0400 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]:46271) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jU6IN-00011p-NN for qemu-devel@nongnu.org; Thu, 30 Apr 2020 06:19:55 -0400 Received: by mail-lf1-x144.google.com with SMTP id g10so734076lfj.13 for ; Thu, 30 Apr 2020 03:19:55 -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 :mime-version:content-transfer-encoding; bh=opmkyJ2lt40WK/inlwbmCnCG1rqTZ+e0R6h7t3/vrFE=; b=k2uRwX9OwkMyYc6oTmZaYb0KThhYS3YQi198O1K+0L1kVRxxAK0SUCfsYVvgzUldR/ Z6sn5JiYJTv5dNxnBp7H3uncJQEQPmDV30syaVPfQFOOyjkAOxZsKMgqvRqnIaqzW0V2 72fj8AdxB3xs+qQTxE6ad88e19Xwy9VPcUQoz3fPYsEljmpNBhn7vH2tSYIn2bKYZCFb RB0Smm5wC5tMCNPouKAL9VxoHilG/PIS5yikifC++luNBpZeWzWUMWvVHvKCYvyvZ7kP 2CLyc00ZXIJPPjwg4qJzeZXJ0TPAz6eC/6kADUZ/XtSV777mv7Y3ALGQWNZbEwvbeG9k NDSg== 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=opmkyJ2lt40WK/inlwbmCnCG1rqTZ+e0R6h7t3/vrFE=; b=hSt4TYho2NvPEnr1XD8AN+TDzZGMOP73HPY8pppDtFaj2mLI1KGrBh+pHMqOqcVC5s x/Mk0G5O6KFtCYQYaSLXurEvU1k1Lazf9tj2UPZl2KzakWDNrK0BgKLSjRpe8AhvchQu qDO2UWUSlnkNYtDCVRsQhCnFjWm0PoDOw20ZZm1qflEx9ZXEkMv6RTUzwwwS6y2/g2Kt mf65DG0mNQksq+urScFfByMsfK9qS+A7QDcqY78/iE+ovEJ0FunLLEo+ZbXRAZb8xtVg 1YE2dzTKbJM8DVYOdy1o0NEGIQVidLzg2l10FqeOQvDI+G2fdCqEJUpz+dlZqQbD+Rbl nWvg== X-Gm-Message-State: AGi0PuYvbBa6I1OFarJjlatdZyaGBQ5+ToVAArjTLRc0gNtytRYUkw5T 89subk8ngc1MOutk8q9kRizFRRJmJR0= X-Google-Smtp-Source: APiQypLlRmQsqA5Ug7rxz2I9zKbOWmyWkc2mt26kAzfzUFlbE85QbiwwXwm++vAS6tQndP0B0WjQsQ== X-Received: by 2002:a19:c3c5:: with SMTP id t188mr1720815lff.199.1588241993402; Thu, 30 Apr 2020 03:19:53 -0700 (PDT) Received: from gmail.com (81-231-232-130-no39.tbcn.telia.com. [81.231.232.130]) by smtp.gmail.com with ESMTPSA id d18sm3868549lfm.36.2020.04.30.03.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2020 03:19:52 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Subject: [PULL v1 1/6] target/microblaze: Add the opcode-0x0-illegal CPU property Date: Thu, 30 Apr 2020 12:19:44 +0200 Message-Id: <20200430101949.7754-2-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430101949.7754-1-edgar.iglesias@gmail.com> References: <20200430101949.7754-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::144; envelope-from=edgar.iglesias@gmail.com; helo=mail-lf1-x144.google.com X-detected-operating-system: by eggs.gnu.org: Error: [-] PROGRAM ABORT : Malformed IPv6 address (bad octet value). Location : parse_addr6(), p0f-client.c:67 X-Received-From: 2a00:1450:4864:20::144 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@xilinx.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: "Edgar E. Iglesias" Add the opcode-0x0-illegal CPU property to control if the core should trap opcode zero as illegal. Reviewed-by: Alistair Francis Reviewed-by: Luc Michel Signed-off-by: Edgar E. Iglesias --- target/microblaze/cpu.h | 1 + target/microblaze/cpu.c | 6 +++++- target/microblaze/translate.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index 1a700a880c..d51587b342 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -303,6 +303,7 @@ struct MicroBlazeCPU { bool endi; bool dopb_bus_exception; bool iopb_bus_exception; + bool opcode_0_illegal; char *version; uint8_t pvr; } cfg; diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index c9cf2364ca..418a0cd1fa 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -206,7 +206,9 @@ static void mb_cpu_realizefn(DeviceState *dev, Error **errp) (cpu->cfg.dopb_bus_exception ? PVR2_DOPB_BUS_EXC_MASK : 0) | (cpu->cfg.iopb_bus_exception ? - PVR2_IOPB_BUS_EXC_MASK : 0); + PVR2_IOPB_BUS_EXC_MASK : 0) | + (cpu->cfg.opcode_0_illegal ? + PVR2_OPCODE_0x0_ILL_MASK : 0); env->pvr.regs[5] |= cpu->cfg.dcache_writeback ? PVR5_DCACHE_WRITEBACK_MASK : 0; @@ -274,6 +276,8 @@ static Property mb_properties[] = { /* Enables bus exceptions on failed instruction fetches. */ DEFINE_PROP_BOOL("iopb-bus-exception", MicroBlazeCPU, cfg.iopb_bus_exception, false), + DEFINE_PROP_BOOL("opcode-0x0-illegal", MicroBlazeCPU, + cfg.opcode_0_illegal, false), DEFINE_PROP_STRING("version", MicroBlazeCPU, cfg.version), DEFINE_PROP_UINT8("pvr", MicroBlazeCPU, cfg.pvr, C_PVR_FULL), DEFINE_PROP_END_OF_LIST(), diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 37a844db99..222632b670 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -1573,7 +1573,7 @@ static inline void decode(DisasContext *dc, uint32_t ir) LOG_DIS("%8.8x\t", dc->ir); if (ir == 0) { - trap_illegal(dc, dc->cpu->env.pvr.regs[2] & PVR2_OPCODE_0x0_ILL_MASK); + trap_illegal(dc, dc->cpu->cfg.opcode_0_illegal); /* Don't decode nop/zero instructions any further. */ return; }