From patchwork Mon Feb 13 08:59:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nikunj A. Dadhania" X-Patchwork-Id: 9569017 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 8FFE060573 for ; Mon, 13 Feb 2017 09:00:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DE6C26B41 for ; Mon, 13 Feb 2017 09:00:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F7A726E98; Mon, 13 Feb 2017 09:00:48 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 1CA9F26B41 for ; Mon, 13 Feb 2017 09:00:48 +0000 (UTC) Received: from localhost ([::1]:55218 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdCV5-0006CN-6I for patchwork-qemu-devel@patchwork.kernel.org; Mon, 13 Feb 2017 04:00:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37983) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdCUg-0006Ae-4L for qemu-devel@nongnu.org; Mon, 13 Feb 2017 04:00:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdCUa-00070k-83 for qemu-devel@nongnu.org; Mon, 13 Feb 2017 04:00:22 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:45773) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cdCUZ-000704-Ub for qemu-devel@nongnu.org; Mon, 13 Feb 2017 04:00:16 -0500 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v1D8rvjb024888 for ; Mon, 13 Feb 2017 04:00:14 -0500 Received: from e23smtp06.au.ibm.com (e23smtp06.au.ibm.com [202.81.31.148]) by mx0a-001b2d01.pphosted.com with ESMTP id 28hxta7pbm-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 13 Feb 2017 04:00:14 -0500 Received: from localhost by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 13 Feb 2017 19:00:10 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp06.au.ibm.com (202.81.31.212) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 13 Feb 2017 19:00:09 +1000 Received: from d23relay09.au.ibm.com (d23relay09.au.ibm.com [9.185.63.181]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 684BD2CE8054 for ; Mon, 13 Feb 2017 20:00:09 +1100 (EST) Received: from d23av05.au.ibm.com (d23av05.au.ibm.com [9.190.234.119]) by d23relay09.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v1D901c521627120 for ; Mon, 13 Feb 2017 20:00:09 +1100 Received: from d23av05.au.ibm.com (localhost [127.0.0.1]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v1D8xaPa016457 for ; Mon, 13 Feb 2017 19:59:37 +1100 Received: from abhimanyu.in.ibm.com ([9.109.221.198]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v1D8xXPf015988; Mon, 13 Feb 2017 19:59:35 +1100 From: Nikunj A Dadhania To: peter.maydell@linaro.org Date: Mon, 13 Feb 2017 14:29:12 +0530 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1486976352-549-1-git-send-email-nikunj@linux.vnet.ibm.com> References: <1486976352-549-1-git-send-email-nikunj@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17021309-0040-0000-0000-000002EECCD6 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17021309-0041-0000-0000-00000C3B7F04 Message-Id: <1486976352-549-2-git-send-email-nikunj@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-02-13_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1612050000 definitions=main-1702130090 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH 2/2] risu_ppc64le: distinguish real illegal instruction 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: joserz@linux.vnet.ibm.com, qemu-devel@nongnu.org, nikunj@linux.vnet.ibm.com, bharata@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP While executing qemu_ppc64le, found an issue that the real illegal instructions are handled as risu_op which results in wrong info at the master end. Even the master needs to distinguish real illegal instructions versus risu_op. Signed-off-by: Nikunj A Dadhania --- risu_ppc64le.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/risu_ppc64le.c b/risu_ppc64le.c index 9c1fafd..54a9bcb 100644 --- a/risu_ppc64le.c +++ b/risu_ppc64le.c @@ -55,7 +55,6 @@ int send_register_info(int sock, void *uc) switch (op) { case OP_COMPARE: case OP_TESTEND: - default: return send_data_pkt(sock, &ri, sizeof(ri)); case OP_SETMEMBLOCK: memblock = (void*)ri.gregs[0]; @@ -66,6 +65,11 @@ int send_register_info(int sock, void *uc) case OP_COMPAREMEM: return send_data_pkt(sock, memblock, MEMBLOCKLEN); break; + default: + fprintf(stderr, "apprentice: Unhandled instruction\n"); + fprintf(stderr, " faulting insn 0x%x\n", ri.faulting_insn); + fprintf(stderr, " insn addr 0x%" PRIx64 "\n\n", ri.nip); + return -1; } return 0; } @@ -85,7 +89,6 @@ int recv_and_compare_register_info(int sock, void *uc) switch (op) { case OP_COMPARE: case OP_TESTEND: - default: if (recv_data_pkt(sock, &apprentice_ri, sizeof(apprentice_ri))) { packet_mismatch = 1; resp = 2; @@ -113,6 +116,11 @@ int recv_and_compare_register_info(int sock, void *uc) } send_response_byte(sock, resp); break; + default: + fprintf(stderr, "master: Unhandled instruction\n"); + fprintf(stderr, " faulting insn 0x%x\n", master_ri.faulting_insn); + fprintf(stderr, " insn addr 0x%" PRIx64 "\n\n", master_ri.nip); + return -1; } return resp; }