From: Michael Ellerman <mpe@ellerman.id.au> To: Mathieu Malaterre <malat@debian.org> Cc: Mathieu Malaterre <malat@debian.org>, Christophe Leroy <christophe.leroy@c-s.fr>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] powerpc/32: sstep: Move variable `rc` within CONFIG_PPC64 sentinels Date: Tue, 28 May 2019 21:40:34 +1000 [thread overview] Message-ID: <87d0k2q025.fsf@concordia.ellerman.id.au> (raw) In-Reply-To: <20190312212318.17822-1-malat@debian.org> Mathieu Malaterre <malat@debian.org> writes: > Fix warnings treated as errors with W=1: > > arch/powerpc/lib/sstep.c:1172:31: error: variable 'rc' set but not used [-Werror=unused-but-set-variable] > > Suggested-by: Christophe Leroy <christophe.leroy@c-s.fr> > Signed-off-by: Mathieu Malaterre <malat@debian.org> > --- > v2: as suggested prefer CONFIG_PPC64 sentinel instead of unused keyword I'd rather avoid adding more ifdefs if we can. I think this works? cheers diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c index 3d33fb509ef4..600b036ddfda 100644 --- a/arch/powerpc/lib/sstep.c +++ b/arch/powerpc/lib/sstep.c @@ -1169,7 +1169,7 @@ static nokprobe_inline int trap_compare(long v1, long v2) int analyse_instr(struct instruction_op *op, const struct pt_regs *regs, unsigned int instr) { - unsigned int opcode, ra, rb, rc, rd, spr, u; + unsigned int opcode, ra, rb, rd, spr, u; unsigned long int imm; unsigned long int val, val2; unsigned int mb, me, sh; @@ -1292,7 +1292,6 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs, rd = (instr >> 21) & 0x1f; ra = (instr >> 16) & 0x1f; rb = (instr >> 11) & 0x1f; - rc = (instr >> 6) & 0x1f; switch (opcode) { #ifdef __powerpc64__ @@ -1307,10 +1306,14 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs, return 1; #ifdef __powerpc64__ - case 4: + case 4: { + unsigned int rc; + if (!cpu_has_feature(CPU_FTR_ARCH_300)) return -1; + rc = (instr >> 6) & 0x1f; + switch (instr & 0x3f) { case 48: /* maddhd */ asm volatile(PPC_MADDHD(%0, %1, %2, %3) : @@ -1336,6 +1339,7 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs, * primary opcode which do not have emulation support yet. */ return -1; + } #endif case 7: /* mulli */
WARNING: multiple messages have this Message-ID (diff)
From: Michael Ellerman <mpe@ellerman.id.au> To: Mathieu Malaterre <malat@debian.org> Cc: Mathieu Malaterre <malat@debian.org>, linux-kernel@vger.kernel.org, Paul Mackerras <paulus@samba.org>, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH v2] powerpc/32: sstep: Move variable `rc` within CONFIG_PPC64 sentinels Date: Tue, 28 May 2019 21:40:34 +1000 [thread overview] Message-ID: <87d0k2q025.fsf@concordia.ellerman.id.au> (raw) In-Reply-To: <20190312212318.17822-1-malat@debian.org> Mathieu Malaterre <malat@debian.org> writes: > Fix warnings treated as errors with W=1: > > arch/powerpc/lib/sstep.c:1172:31: error: variable 'rc' set but not used [-Werror=unused-but-set-variable] > > Suggested-by: Christophe Leroy <christophe.leroy@c-s.fr> > Signed-off-by: Mathieu Malaterre <malat@debian.org> > --- > v2: as suggested prefer CONFIG_PPC64 sentinel instead of unused keyword I'd rather avoid adding more ifdefs if we can. I think this works? cheers diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c index 3d33fb509ef4..600b036ddfda 100644 --- a/arch/powerpc/lib/sstep.c +++ b/arch/powerpc/lib/sstep.c @@ -1169,7 +1169,7 @@ static nokprobe_inline int trap_compare(long v1, long v2) int analyse_instr(struct instruction_op *op, const struct pt_regs *regs, unsigned int instr) { - unsigned int opcode, ra, rb, rc, rd, spr, u; + unsigned int opcode, ra, rb, rd, spr, u; unsigned long int imm; unsigned long int val, val2; unsigned int mb, me, sh; @@ -1292,7 +1292,6 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs, rd = (instr >> 21) & 0x1f; ra = (instr >> 16) & 0x1f; rb = (instr >> 11) & 0x1f; - rc = (instr >> 6) & 0x1f; switch (opcode) { #ifdef __powerpc64__ @@ -1307,10 +1306,14 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs, return 1; #ifdef __powerpc64__ - case 4: + case 4: { + unsigned int rc; + if (!cpu_has_feature(CPU_FTR_ARCH_300)) return -1; + rc = (instr >> 6) & 0x1f; + switch (instr & 0x3f) { case 48: /* maddhd */ asm volatile(PPC_MADDHD(%0, %1, %2, %3) : @@ -1336,6 +1339,7 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs, * primary opcode which do not have emulation support yet. */ return -1; + } #endif case 7: /* mulli */
next prev parent reply other threads:[~2019-05-28 11:40 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-03-12 20:20 [PATCH] powerpc: sstep: Mark variable `rc` as unused in function 'analyse_instr' Mathieu Malaterre 2019-03-12 20:20 ` Mathieu Malaterre 2019-03-12 20:56 ` Christophe Leroy 2019-03-12 20:56 ` Christophe Leroy 2019-03-12 21:12 ` Mathieu Malaterre 2019-03-12 21:12 ` Mathieu Malaterre 2019-03-12 21:25 ` Christophe Leroy 2019-03-12 21:25 ` Christophe Leroy 2019-03-13 20:12 ` Mathieu Malaterre 2019-03-13 20:12 ` Mathieu Malaterre 2019-03-12 21:23 ` [PATCH v2] powerpc/32: sstep: Move variable `rc` within CONFIG_PPC64 sentinels Mathieu Malaterre 2019-03-12 21:23 ` Mathieu Malaterre 2019-05-23 11:49 ` Mathieu Malaterre 2019-05-23 11:49 ` Mathieu Malaterre 2019-05-28 11:40 ` Michael Ellerman [this message] 2019-05-28 11:40 ` Michael Ellerman 2019-05-28 15:52 ` Mathieu Malaterre 2019-05-28 15:52 ` Mathieu Malaterre
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=87d0k2q025.fsf@concordia.ellerman.id.au \ --to=mpe@ellerman.id.au \ --cc=benh@kernel.crashing.org \ --cc=christophe.leroy@c-s.fr \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=malat@debian.org \ --cc=paulus@samba.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.