From patchwork Mon Apr 20 17:52:46 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: 11499529 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A8C52913 for ; Mon, 20 Apr 2020 17:54:08 +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 7916D20B1F for ; Mon, 20 Apr 2020 17:54:08 +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="YEKsPha5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7916D20B1F 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:39972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQacR-0008R6-EV for patchwork-qemu-devel@patchwork.kernel.org; Mon, 20 Apr 2020 13:54:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36542 helo=eggs1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQabJ-0006dv-V6 for qemu-devel@nongnu.org; Mon, 20 Apr 2020 13:52:58 -0400 Received: from Debian-exim by eggs1p.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQabJ-0003x3-3o for qemu-devel@nongnu.org; Mon, 20 Apr 2020 13:52:57 -0400 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]:33653) by eggs1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQabI-0003tl-NW for qemu-devel@nongnu.org; Mon, 20 Apr 2020 13:52:56 -0400 Received: by mail-lj1-x244.google.com with SMTP id w20so4716095ljj.0 for ; Mon, 20 Apr 2020 10:52:56 -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=jZokMyQsNznnsjTzWlvQibgi/xwwIy5eNYMrDnjS46c=; b=YEKsPha5nFuMnYkf6c23MWpXSe04vZ7TEMmqcJoAD4v0aejItRGwMOgdfZAGvcmenO 77akDOqF11dNazQiHrGnRAUDyoh/eEEf0KqeezKLTfy4Ia+AXp/N1Nz+3keV8yFo9sAI Kbw+lnFvI/4KdFPHpc1cofZ46rU/3UjTLoGx4cgYRKK7ml8Ej8FTZSY+/V2WlxRwS2Vj o8zydhWSfdUOCpRdhpDwGNugjXquhrSLpwXp9s8BFqG8VpZGgCB3VmOXbNYZPZLPbM+h 0o98mRRspcCRnMdDPMRZ2A0xNFOVKdQt+XYgNzP7lp+3yHePp9pT1DyKydB7dVAeA2DU zICA== 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=jZokMyQsNznnsjTzWlvQibgi/xwwIy5eNYMrDnjS46c=; b=AmlxuGR5gHm9Zo6rGjF3dgovWO0EE3eibpn+ybKBeyEo8zceyF/eljvmPpZ/mPw9At Lr+ZzwB8LKUZP/y9ViSAbQxc5k9WbCBZ3iM8k/xKbcr2Us1jeeeaFzdTm68OYcOcUm5T 8VyQaKhUVofDyO1F/7nFC/XS5oqhxqaakW4L+uCGxP8RMZmoyZ4y+MbbkqDzTxFooDSr ejtIdMSkf1KF25uP33cGO/3VsEU1X/+R6suQeywviyVkhvW96TKh8q5AJ5RXEKuNgDBv hSwlAPjcSqwvZDeUzM9dvRVSdiSkGp91yBpyOvKmaIfMZ9J9siIXTuswF2a9ENNkThas crpw== X-Gm-Message-State: AGi0PuYiyomd8QwMzUBt1eDnBnXmAe8QIEK/x7K2Jxqem77WkmvvfoXT 8T1vElo/OnHEDiEPVjbIRYtIfRc50og= X-Google-Smtp-Source: APiQypJ4FZzTSxDQuBZ3ht4kYrh27Nw6xpaLEyKdLK7QoOyrJP4KeYiSMoz1KZQONgfNSSqM+uFW2g== X-Received: by 2002:a2e:b4c2:: with SMTP id r2mr6437955ljm.143.1587405174796; Mon, 20 Apr 2020 10:52:54 -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 x11sm126954ljj.15.2020.04.20.10.52.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2020 10:52:54 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Subject: [PATCH v2 2/6] target/microblaze: Add the ill-opcode-exception property Date: Mon, 20 Apr 2020 19:52:46 +0200 Message-Id: <20200420175250.25777-3-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200420175250.25777-1-edgar.iglesias@gmail.com> References: <20200420175250.25777-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::244; envelope-from=edgar.iglesias@gmail.com; helo=mail-lj1-x244.google.com X-detected-operating-system: by eggs1p.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::244 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: figlesia@xilinx.com, peter.maydell@linaro.org, sstabellini@kernel.org, edgar.iglesias@xilinx.com, sai.pavan.boddu@xilinx.com, frasse.iglesias@gmail.com, alistair@alistair23.me, richard.henderson@linaro.org, frederic.konrad@adacore.com, philmd@redhat.com, luc.michel@greensocs.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: "Edgar E. Iglesias" Add the ill-opcode-exception property to control if illegal instructions will raise exceptions. Reviewed-by: Alistair Francis Reviewed-by: Luc Michel Signed-off-by: Edgar E. Iglesias --- target/microblaze/cpu.c | 4 ++++ target/microblaze/cpu.h | 1 + target/microblaze/translate.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index 1044120702..36c20d9724 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -207,6 +207,8 @@ static void mb_cpu_realizefn(DeviceState *dev, Error **errp) PVR2_DOPB_BUS_EXC_MASK : 0) | (cpu->cfg.iopb_bus_exception ? PVR2_IOPB_BUS_EXC_MASK : 0) | + (cpu->cfg.illegal_opcode_exception ? + PVR2_ILL_OPCODE_EXC_MASK : 0) | (cpu->cfg.opcode_0_illegal ? PVR2_OPCODE_0x0_ILL_MASK : 0); @@ -276,6 +278,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("ill-opcode-exception", MicroBlazeCPU, + cfg.illegal_opcode_exception, false), DEFINE_PROP_BOOL("opcode-0x0-illegal", MicroBlazeCPU, cfg.opcode_0_illegal, false), DEFINE_PROP_STRING("version", MicroBlazeCPU, cfg.version), diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index d51587b342..71d7317a58 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 illegal_opcode_exception; bool opcode_0_illegal; char *version; uint8_t pvr; diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 222632b670..b4a78551ef 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -185,7 +185,7 @@ static void write_carryi(DisasContext *dc, bool carry) static bool trap_illegal(DisasContext *dc, bool cond) { if (cond && (dc->tb_flags & MSR_EE_FLAG) - && (dc->cpu->env.pvr.regs[2] & PVR2_ILL_OPCODE_EXC_MASK)) { + && dc->cpu->cfg.illegal_opcode_exception) { tcg_gen_movi_i64(cpu_SR[SR_ESR], ESR_EC_ILLEGAL_OP); t_gen_raise_exception(dc, EXCP_HW_EXCP); }