{"id":805765,"url":"http://patchwork.ozlabs.org/api/1.2/patches/805765/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1503639722-19121-5-git-send-email-paulus@ozlabs.org/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/1.2/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/","list_archive_url":"https://lore.kernel.org/linuxppc-dev/","list_archive_url_format":"https://lore.kernel.org/linuxppc-dev/{}/","commit_url_format":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}"},"msgid":"<1503639722-19121-5-git-send-email-paulus@ozlabs.org>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/1503639722-19121-5-git-send-email-paulus@ozlabs.org/","date":"2017-08-25T05:41:56","name":"[v2,04/10] powerpc: Add emulation for the addpcis instruction","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"b4431b898697144c4accd3895a957829cd16b510","submitter":{"id":67079,"url":"http://patchwork.ozlabs.org/api/1.2/people/67079/?format=json","name":"Paul Mackerras","email":"paulus@ozlabs.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1503639722-19121-5-git-send-email-paulus@ozlabs.org/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/805765/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/805765/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org","linuxppc-dev@ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xdrR13gCyz9sRW\n\tfor ;\n\tFri, 25 Aug 2017 16:11:57 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xdrR12RxbzDqR9\n\tfor ;\n\tFri, 25 Aug 2017 16:11:57 +1000 (AEST)","from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xdrDW0rKPzDqXy\n\tfor ;\n\tFri, 25 Aug 2017 16:02:51 +1000 (AEST)","by ozlabs.org (Postfix)\n\tid 3xdrDW0568z9sRW; Fri, 25 Aug 2017 16:02:51 +1000 (AEST)","from authenticated.ozlabs.org (localhost [127.0.0.1])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPSA id 3xdrDV62jlz9sxR\n\tfor ; Fri, 25 Aug 2017 16:02:50 +1000 (AEST)"],"Authentication-Results":["ozlabs.org; dkim=pass (2048-bit key;\n\tsecure) header.d=ozlabs.org header.i=@ozlabs.org header.b=\"IG+xhFFC\";\n\tdkim-atps=neutral","lists.ozlabs.org; dkim=pass (2048-bit key;\n\tsecure) header.d=ozlabs.org header.i=@ozlabs.org header.b=\"IG+xhFFC\";\n\tdkim-atps=neutral","lists.ozlabs.org; dkim=pass (2048-bit key;\n\tsecure) header.d=ozlabs.org header.i=@ozlabs.org header.b=\"IG+xhFFC\"; \n\tdkim-atps=neutral"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ozlabs.org; s=201707; \n\tt=1503640970; bh=mPF5/NFtTkWBctsHtE2RojTl/uOu2ESxD2IWeqE7sn8=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=IG+xhFFCIkViDVWcxbH36jLGUJLdj7152biGs22EJloa1OyqpSDfi/eeoCeHk+Obs\n\tFAmpr1U0i/dcbsUPpR3kYL3nCByK5GsLB4Kd6aW0UnEgWmmAtNWEI8pCovRmbWxt4U\n\tqtqllSDmWRANMuC6sbhvAPqgJ/2iaBWd+OXptZJaLTY4pDOoADipAXxu8BP6BRNz9n\n\trkZjVR+kQHe4Byipne7i4wRWrnDp5v3EohhgJcvSaYnaYvScs6S5BFBq/ZGXHcdNbc\n\twTkWooer83s6+6KGFOEhyZqFk4RqBU4FG5Oz044owPBLw6R+c2G/JDejvOqkVbVZ7J\n\tWsu3y+n25gwnQ==","From":"Paul Mackerras ","To":"linuxppc-dev@ozlabs.org","Subject":"[PATCH v2 04/10] powerpc: Add emulation for the addpcis instruction","Date":"Fri, 25 Aug 2017 15:41:56 +1000","Message-Id":"<1503639722-19121-5-git-send-email-paulus@ozlabs.org>","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1503639722-19121-1-git-send-email-paulus@ozlabs.org>","References":"<1503639722-19121-1-git-send-email-paulus@ozlabs.org>","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t"},"content":"The addpcis instruction puts the sum of the next instruction address\nplus a constant into a register. Since the result depends on the\naddress of the instruction, it will give an incorrect result if it\nis single-stepped out of line, which is what the *probes subsystem\nwill currently do if a probe is placed on an addpcis instruction.\nThis fixes the problem by adding emulation of it to analyse_instr().\n\nSigned-off-by: Paul Mackerras \n---\n arch/powerpc/lib/sstep.c | 14 +++++++++++---\n 1 file changed, 11 insertions(+), 3 deletions(-)","diff":"diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c\nindex 7921b2a..d9b3b63 100644\n--- a/arch/powerpc/lib/sstep.c\n+++ b/arch/powerpc/lib/sstep.c\n@@ -1024,9 +1024,6 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs,\n \t\t\top->ccval = (regs->ccr & ~(1UL << (31 - rd))) |\n \t\t\t\t(val << (31 - rd));\n \t\t\treturn 1;\n-\t\tdefault:\n-\t\t\top->type = UNKNOWN;\n-\t\t\treturn 0;\n \t\t}\n \t\tbreak;\n \tcase 31:\n@@ -1126,6 +1123,17 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs,\n \t\top->val = imm;\n \t\tgoto compute_done;\n \n+\tcase 19:\n+\t\tif (((instr >> 1) & 0x1f) == 2) {\n+\t\t\t/* addpcis */\n+\t\t\timm = (short) (instr & 0xffc1);\t/* d0 + d2 fields */\n+\t\t\timm |= (instr >> 15) & 0x3e;\t/* d1 field */\n+\t\t\top->val = regs->nip + (imm << 16) + 4;\n+\t\t\tgoto compute_done;\n+\t\t}\n+\t\top->type = UNKNOWN;\n+\t\treturn 0;\n+\n \tcase 20:\t/* rlwimi */\n \t\tmb = (instr >> 6) & 0x1f;\n \t\tme = (instr >> 1) & 0x1f;\n","prefixes":["v2","04/10"]}