From patchwork Mon Jul 2 13:57:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 10501471 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 89E776028F for ; Mon, 2 Jul 2018 14:02:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 772CD1FF28 for ; Mon, 2 Jul 2018 14:02:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A8422878F; Mon, 2 Jul 2018 14:02:42 +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=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, 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 0D0671FF28 for ; Mon, 2 Jul 2018 14:02:42 +0000 (UTC) Received: from localhost ([::1]:32960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzPd-0005kr-6h for patchwork-qemu-devel@patchwork.kernel.org; Mon, 02 Jul 2018 10:02:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzLS-0002AA-I8 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 09:58:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzLR-0007sc-Mj for qemu-devel@nongnu.org; Mon, 02 Jul 2018 09:58:22 -0400 Received: from mail-pl0-x22c.google.com ([2607:f8b0:400e:c01::22c]:46719) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzLR-0007sK-HD for qemu-devel@nongnu.org; Mon, 02 Jul 2018 09:58:21 -0400 Received: by mail-pl0-x22c.google.com with SMTP id 30-v6so7999943pld.13 for ; Mon, 02 Jul 2018 06:58:21 -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=Zf+D1raeWsoWAsHnT7ef46EOTupNmWqr70cskO2ieC0=; b=WOMSxSE4vhYYTpYFYKjKqRLlNSakkOrNwFynD7ywt+xOcrrsQC+mfGQ6XRKYri4JVQ eY2NRB8SGZKD9z4hkhXIQYqp3vUlv/4GclH4OOHhXpJ8Z0LYwpjx+BAKwVCwk2hHejf7 R5uUqLunjTFR2vWuqNmYYlAj60aWklmuukbXi9O5Sgp6rmggQdCRSE0EwMeew8mkXAx9 f5lMwP7VQ/8P11GWU5GJrQgok5RhGSNjSx+3+vw46JkNRYgLL+GTuhDY4x1P/1JZSKFt F2500LMLKzLfzqjxwLe7hgSUqIffoxeTk3qmRlQk144Y+1tTXjl8F1M1v3n9o/zWNgHK aApg== 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=Zf+D1raeWsoWAsHnT7ef46EOTupNmWqr70cskO2ieC0=; b=U9ynIhwAiQITgVI+Qd+Y04AJkpyfzX+6KWmPu7D4smUKv+Wmprr4XX7Uxasw46/lsy fjLTrykVeQYuVuPImtoF86cVJXRbVe1TSdwDJBhqaRr2ZdCVdTUI7KfCWnhi8nCsoCWa kt/MEIp3tV5NYIYe4NhE18UX3Z9/U/LvAkqYDlK8KsnaNpcn+dmeBh7KyC9H6sR91K/l 8Ecq0XkDjtZ3Pd7mYeP/RChUioS2EPfRbPeeohHa4UoAPoBKftg/Iml3duEh2gkKRE6w K8GVk8pO8wpXkMMN17AObc02J7tlJXHmKN/0e+4D1DSLbL0af05mGmBzR5Oce7WAClT+ tbvg== X-Gm-Message-State: APt69E1IbYvmCWwBsQ6Q2pDhHPk0Yl8CjWZosd4XeDGx+BZU8dAz9OHk ZQaVUVlQ4anAxB0Lavq0skk= X-Google-Smtp-Source: AAOMgpeShJ8Q+SIMNVo5ueUgeaf7VkgjAtVaHd2wcArhplZ7nPOTOMZZTfminnEZ6m+ajISQLIGcVA== X-Received: by 2002:a17:902:7790:: with SMTP id o16-v6mr21377009pll.130.1530539900527; Mon, 02 Jul 2018 06:58:20 -0700 (PDT) Received: from localhost (g90.124-44-6.ppp.wakwak.ne.jp. [124.44.6.90]) by smtp.gmail.com with ESMTPSA id p12-v6sm5628601pfj.21.2018.07.02.06.58.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 06:58:20 -0700 (PDT) From: Stafford Horne To: Peter Maydell Date: Mon, 2 Jul 2018 22:57:44 +0900 Message-Id: <20180702135806.7087-4-shorne@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180702135806.7087-1-shorne@gmail.com> References: <20180702135806.7087-1-shorne@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::22c Subject: [Qemu-devel] [PULL 03/25] target/openrisc: Log interrupts 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: Stafford Horne , Richard Henderson , QEMU Development Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Signed-off-by: Stafford Horne --- target/openrisc/interrupt.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/target/openrisc/interrupt.c b/target/openrisc/interrupt.c index 3959671c59..25351d5de3 100644 --- a/target/openrisc/interrupt.c +++ b/target/openrisc/interrupt.c @@ -32,6 +32,7 @@ void openrisc_cpu_do_interrupt(CPUState *cs) #ifndef CONFIG_USER_ONLY OpenRISCCPU *cpu = OPENRISC_CPU(cs); CPUOpenRISCState *env = &cpu->env; + int exception = cs->exception_index; env->epcr = env->pc; if (env->dflag) { @@ -41,12 +42,12 @@ void openrisc_cpu_do_interrupt(CPUState *cs) } else { env->sr &= ~SR_DSX; } - if (cs->exception_index == EXCP_SYSCALL) { + if (exception == EXCP_SYSCALL) { env->epcr += 4; } /* When we have an illegal instruction the error effective address shall be set to the illegal instruction address. */ - if (cs->exception_index == EXCP_ILLEGAL) { + if (exception == EXCP_ILLEGAL) { env->eear = env->pc; } @@ -66,8 +67,27 @@ void openrisc_cpu_do_interrupt(CPUState *cs) env->tlb->cpu_openrisc_map_address_code = &cpu_openrisc_get_phys_nommu; env->lock_addr = -1; - if (cs->exception_index > 0 && cs->exception_index < EXCP_NR) { - hwaddr vect_pc = cs->exception_index << 8; + if (exception > 0 && exception < EXCP_NR) { + static const char * const int_name[EXCP_NR] = { + [EXCP_RESET] = "RESET", + [EXCP_BUSERR] = "BUSERR (bus error)", + [EXCP_DPF] = "DFP (data protection fault)", + [EXCP_IPF] = "IPF (code protection fault)", + [EXCP_TICK] = "TICK (timer interrupt)", + [EXCP_ALIGN] = "ALIGN", + [EXCP_ILLEGAL] = "ILLEGAL", + [EXCP_INT] = "INT (device interrupt)", + [EXCP_DTLBMISS] = "DTLBMISS (data tlb miss)", + [EXCP_ITLBMISS] = "ITLBMISS (code tlb miss)", + [EXCP_RANGE] = "RANGE", + [EXCP_SYSCALL] = "SYSCALL", + [EXCP_FPE] = "FPE", + [EXCP_TRAP] = "TRAP", + }; + + qemu_log_mask(CPU_LOG_INT, "INT: %s\n", int_name[exception]); + + hwaddr vect_pc = exception << 8; if (env->cpucfgr & CPUCFGR_EVBARP) { vect_pc |= env->evbar; } @@ -76,7 +96,7 @@ void openrisc_cpu_do_interrupt(CPUState *cs) } env->pc = vect_pc; } else { - cpu_abort(cs, "Unhandled exception 0x%x\n", cs->exception_index); + cpu_abort(cs, "Unhandled exception 0x%x\n", exception); } #endif