From patchwork Thu Dec 3 12:41:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vineet Gupta X-Patchwork-Id: 552243 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7CFAC14030D for ; Thu, 3 Dec 2015 23:43:02 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a4TDx-0003zR-7U; Thu, 03 Dec 2015 12:43:01 +0000 Received: from smtprelay2.synopsys.com ([198.182.60.111] helo=smtprelay.synopsys.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a4TDv-0003ts-9u for linux-snps-arc@lists.infradead.org; Thu, 03 Dec 2015 12:42:59 +0000 Received: from us02secmta1.synopsys.com (us02secmta1.synopsys.com [10.12.235.96]) by smtprelay.synopsys.com (Postfix) with ESMTP id 04FC510C1219; Thu, 3 Dec 2015 04:42:40 -0800 (PST) Received: from us02secmta1.internal.synopsys.com (us02secmta1.internal.synopsys.com [127.0.0.1]) by us02secmta1.internal.synopsys.com (Service) with ESMTP id ED0704E21A; Thu, 3 Dec 2015 04:42:39 -0800 (PST) Received: from mailhost.synopsys.com (mailhost1.synopsys.com [10.12.238.239]) by us02secmta1.internal.synopsys.com (Service) with ESMTP id BA14D4E218; Thu, 3 Dec 2015 04:42:39 -0800 (PST) Received: from mailhost.synopsys.com (localhost [127.0.0.1]) by mailhost.synopsys.com (Postfix) with ESMTP id A49E6F49; Thu, 3 Dec 2015 04:42:39 -0800 (PST) Received: from US01WEHTC3.internal.synopsys.com (us01wehtc3.internal.synopsys.com [10.15.84.232]) by mailhost.synopsys.com (Postfix) with ESMTP id 980D6F48; Thu, 3 Dec 2015 04:42:39 -0800 (PST) Received: from IN01WEHTCB.internal.synopsys.com (10.144.199.106) by US01WEHTC3.internal.synopsys.com (10.15.84.232) with Microsoft SMTP Server (TLS) id 14.3.195.1; Thu, 3 Dec 2015 04:42:39 -0800 Received: from IN01WEHTCA.internal.synopsys.com (10.144.199.103) by IN01WEHTCB.internal.synopsys.com (10.144.199.105) with Microsoft SMTP Server (TLS) id 14.3.195.1; Thu, 3 Dec 2015 18:12:36 +0530 Received: from vineetg-E7440.internal.synopsys.com (10.12.197.182) by IN01WEHTCA.internal.synopsys.com (10.144.199.243) with Microsoft SMTP Server (TLS) id 14.3.195.1; Thu, 3 Dec 2015 18:12:35 +0530 From: Vineet Gupta To: Subject: [PATCH 13/17] ARC: dw2 unwind: Assume all regs to be unsigned long Date: Thu, 3 Dec 2015 18:11:11 +0530 Message-ID: <1449146475-15335-14-git-send-email-vgupta@synopsys.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449146475-15335-1-git-send-email-vgupta@synopsys.com> References: <1449146475-15335-1-git-send-email-vgupta@synopsys.com> MIME-Version: 1.0 X-Originating-IP: [10.12.197.182] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151203_044259_357848_50E15317 X-CRM114-Status: UNSURE ( 9.95 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [198.182.60.111 listed in wl.mailspike.net] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [198.182.60.111 listed in list.dnswl.org] -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-snps-arc@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on Synopsys ARC Processors List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vineet Gupta , Alexey.Brodkin@synopsys.com, linux-kernel@vger.kernel.org, JBeulich@suse.com Sender: "linux-snps-arc" Errors-To: linux-snps-arc-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Vineet Gupta --- arch/arc/include/asm/unwind.h | 3 +- arch/arc/kernel/unwind.c | 74 +++---------------------------------------- 2 files changed, 6 insertions(+), 71 deletions(-) diff --git a/arch/arc/include/asm/unwind.h b/arch/arc/include/asm/unwind.h index 03ace2cc8bc5..a1dbcf6cb361 100644 --- a/arch/arc/include/asm/unwind.h +++ b/arch/arc/include/asm/unwind.h @@ -66,8 +66,7 @@ struct unwind_frame_info { BUILD_BUG_ON_ZERO(offsetof(struct unwind_frame_info, f) \ % FIELD_SIZEOF(struct unwind_frame_info, f)) \ + offsetof(struct unwind_frame_info, f) \ - / FIELD_SIZEOF(struct unwind_frame_info, f), \ - FIELD_SIZEOF(struct unwind_frame_info, f) \ + / FIELD_SIZEOF(struct unwind_frame_info, f) \ } #define PTREGS_INFO(f) EXTRA_INFO(regs.f) diff --git a/arch/arc/kernel/unwind.c b/arch/arc/kernel/unwind.c index 6eb377c102c6..b2053b55d076 100644 --- a/arch/arc/kernel/unwind.c +++ b/arch/arc/kernel/unwind.c @@ -45,7 +45,6 @@ do { \ static const struct { unsigned offs:BITS_PER_LONG / 2; - unsigned width:BITS_PER_LONG / 2; } reg_info[] = { UNW_REGISTER_INFO }; #define DW_CFA_nop 0x00 @@ -996,7 +995,6 @@ int arc_unwind(struct unwind_frame_info *frame) || state.loc > endLoc /* || state.regs[retAddrReg].where == Nowhere */ || state.cfa.reg >= ARRAY_SIZE(reg_info) - || reg_info[state.cfa.reg].width != sizeof(unsigned long) || state.cfa.offs % sizeof(unsigned long)) return -EIO; @@ -1025,28 +1023,8 @@ int arc_unwind(struct unwind_frame_info *frame) if (state.regs[i].where == Register) { if (state.regs[i].value >= ARRAY_SIZE(reg_info)) return -EIO; - switch (reg_info[state.regs[i].value].width) { - case sizeof(u8): - state.regs[i].value = - FRAME_REG(state.regs[i].value, const u8); - break; - case sizeof(u16): - state.regs[i].value = - FRAME_REG(state.regs[i].value, const u16); - break; - case sizeof(u32): - state.regs[i].value = - FRAME_REG(state.regs[i].value, const u32); - break; -#ifdef CONFIG_64BIT - case sizeof(u64): - state.regs[i].value = - FRAME_REG(state.regs[i].value, const u64); - break; -#endif - default: - return -EIO; - } + + state.regs[i].value = FRAME_REG(state.regs[i].value, unsigned long); } } @@ -1056,35 +1034,15 @@ int arc_unwind(struct unwind_frame_info *frame) switch (state.regs[i].where) { case Nowhere: - if (reg_info[i].width != sizeof(UNW_SP(frame)) - || &FRAME_REG(i, __typeof__(UNW_SP(frame))) + if (&FRAME_REG(i, __typeof__(UNW_SP(frame))) != &UNW_SP(frame)) continue; UNW_SP(frame) = cfa; break; case Register: - switch (reg_info[i].width) { - case sizeof(u8): - FRAME_REG(i, u8) = state.regs[i].value; - break; - case sizeof(u16): - FRAME_REG(i, u16) = state.regs[i].value; - break; - case sizeof(u32): - FRAME_REG(i, u32) = state.regs[i].value; - break; -#ifdef CONFIG_64BIT - case sizeof(u64): - FRAME_REG(i, u64) = state.regs[i].value; - break; -#endif - default: - return -EIO; - } + FRAME_REG(i, unsigned long) = state.regs[i].value; break; case Value: - if (reg_info[i].width != sizeof(unsigned long)) - return -EIO; FRAME_REG(i, unsigned long) = cfa + state.regs[i].value * state.dataAlign; break; @@ -1098,29 +1056,7 @@ int arc_unwind(struct unwind_frame_info *frame) || addr + sizeof(unsigned long) > endLoc) return -EIO; - switch (reg_info[i].width) { - case sizeof(u8): - __get_user(FRAME_REG(i, u8), - (u8 __user *)addr); - break; - case sizeof(u16): - __get_user(FRAME_REG(i, u16), - (u16 __user *)addr); - break; - case sizeof(u32): - __get_user(FRAME_REG(i, u32), - (u32 __user *)addr); - break; -#ifdef CONFIG_64BIT - case sizeof(u64): - __get_user(FRAME_REG(i, u64), - (u64 __user *)addr); - break; -#endif - default: - return -EIO; - } - + __get_user(FRAME_REG(i, unsigned long), (unsigned long __user *)addr); break; } unw_debug("r%d: 0x%lx\n", i, *fptr);