From: Namhyung Kim <namhyung@gmail.com>
To: Roland McGrath <roland@redhat.com>,
Oleg Nesterov <oleg@redhat.com>, Arnd Bergmann <arnd@arndb.de>
Cc: linux-kernel@vger.kernel.org, Paul Mundt <lethal@linux-sh.org>
Subject: [RFC PATCH 36/43] ptrace, sh: cleanup arch_ptrace()
Date: Fri, 27 Aug 2010 18:42:22 +0900 [thread overview]
Message-ID: <1282902149-12991-37-git-send-email-namhyung@gmail.com> (raw)
In-Reply-To: <1282902149-12991-1-git-send-email-namhyung@gmail.com>
remove unnecessary castings, get rid of dummy pointer in favour of offsetof()
macro and use temporary variables in order to improve readability.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mundt <lethal@linux-sh.org>
---
arch/sh/kernel/ptrace_32.c | 38 +++++++++++++++++++++-----------------
arch/sh/kernel/ptrace_64.c | 17 ++++++++++-------
2 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c
index c81a6b9..926f706 100644
--- a/arch/sh/kernel/ptrace_32.c
+++ b/arch/sh/kernel/ptrace_32.c
@@ -341,7 +341,6 @@ const struct user_regset_view *task_user_regset_view(struct task_struct *task)
long arch_ptrace(struct task_struct *child, long request,
unsigned long addr, unsigned long data)
{
- struct user * dummy = NULL;
unsigned long __user *datap = (unsigned long __user *)data;
int ret;
@@ -356,17 +355,20 @@ long arch_ptrace(struct task_struct *child, long request,
if (addr < sizeof(struct pt_regs))
tmp = get_stack_long(child, addr);
- else if (addr >= (unsigned long) &dummy->fpu &&
- addr < (unsigned long) &dummy->u_fpvalid) {
+ else if (addr >= offsetof(struct user, fpu) &&
+ addr < offsetof(struct user, u_fpvalid)) {
if (!tsk_used_math(child)) {
- if (addr == (unsigned long)&dummy->fpu.fpscr)
+ if (addr == offsetof(struct user, fpu.fpscr))
tmp = FPSCR_INIT;
else
tmp = 0;
- } else
+ } else {
+ unsigned long index;
+ index = addr - offsetof(struct user, fpu);
tmp = ((unsigned long *)child->thread.xstate)
- [(addr - (unsigned long)&dummy->fpu) >> 2];
- } else if (addr == (unsigned long) &dummy->u_fpvalid)
+ [index >> 2];
+ }
+ } else if (addr == offsetof(struct user, u_fpvalid))
tmp = !!tsk_used_math(child);
else if (addr == PT_TEXT_ADDR)
tmp = child->mm->start_code;
@@ -389,13 +391,15 @@ long arch_ptrace(struct task_struct *child, long request,
if (addr < sizeof(struct pt_regs))
ret = put_stack_long(child, addr, data);
- else if (addr >= (unsigned long) &dummy->fpu &&
- addr < (unsigned long) &dummy->u_fpvalid) {
+ else if (addr >= offsetof(struct user, fpu) &&
+ addr < offsetof(struct user, u_fpvalid)) {
+ unsigned long index;
+ index = addr - offsetof(struct user, fpu);
set_stopped_child_used_math(child);
((unsigned long *)child->thread.xstate)
- [(addr - (unsigned long)&dummy->fpu) >> 2] = data;
+ [index >> 2] = data;
ret = 0;
- } else if (addr == (unsigned long) &dummy->u_fpvalid) {
+ } else if (addr == offsetof(struct user, u_fpvalid)) {
conditional_stopped_child_used_math(data, child);
ret = 0;
}
@@ -405,35 +409,35 @@ long arch_ptrace(struct task_struct *child, long request,
return copy_regset_to_user(child, &user_sh_native_view,
REGSET_GENERAL,
0, sizeof(struct pt_regs),
- (void __user *)data);
+ datap);
case PTRACE_SETREGS:
return copy_regset_from_user(child, &user_sh_native_view,
REGSET_GENERAL,
0, sizeof(struct pt_regs),
- (const void __user *)data);
+ datap);
#ifdef CONFIG_SH_FPU
case PTRACE_GETFPREGS:
return copy_regset_to_user(child, &user_sh_native_view,
REGSET_FPU,
0, sizeof(struct user_fpu_struct),
- (void __user *)data);
+ datap);
case PTRACE_SETFPREGS:
return copy_regset_from_user(child, &user_sh_native_view,
REGSET_FPU,
0, sizeof(struct user_fpu_struct),
- (const void __user *)data);
+ datap);
#endif
#ifdef CONFIG_SH_DSP
case PTRACE_GETDSPREGS:
return copy_regset_to_user(child, &user_sh_native_view,
REGSET_DSP,
0, sizeof(struct pt_dspregs),
- (void __user *)data);
+ datap);
case PTRACE_SETDSPREGS:
return copy_regset_from_user(child, &user_sh_native_view,
REGSET_DSP,
0, sizeof(struct pt_dspregs),
- (const void __user *)data);
+ datap);
#endif
default:
ret = ptrace_request(child, request, addr, data);
diff --git a/arch/sh/kernel/ptrace_64.c b/arch/sh/kernel/ptrace_64.c
index c2c2ed5..5a33fac 100644
--- a/arch/sh/kernel/ptrace_64.c
+++ b/arch/sh/kernel/ptrace_64.c
@@ -308,6 +308,7 @@ long arch_ptrace(struct task_struct *child, long request,
unsigned long addr, unsigned long data)
{
int ret;
+ unsigned long __user *datap = (unsigned long __user *) data;
switch (request) {
/* read the word at location addr in the USER area. */
@@ -322,13 +323,14 @@ long arch_ptrace(struct task_struct *child, long request,
tmp = get_stack_long(child, addr);
else if ((addr >= offsetof(struct user, fpu)) &&
(addr < offsetof(struct user, u_fpvalid))) {
- tmp = get_fpu_long(child, addr - offsetof(struct user, fpu));
+ unsigned long index = addr - offsetof(struct user, fpu);
+ tmp = get_fpu_long(child, index);
} else if (addr == offsetof(struct user, u_fpvalid)) {
tmp = !!tsk_used_math(child);
} else {
break;
}
- ret = put_user(tmp, (unsigned long *)data);
+ ret = put_user(tmp, datap);
break;
}
@@ -359,7 +361,8 @@ long arch_ptrace(struct task_struct *child, long request,
}
else if ((addr >= offsetof(struct user, fpu)) &&
(addr < offsetof(struct user, u_fpvalid))) {
- ret = put_fpu_long(child, addr - offsetof(struct user, fpu), data);
+ unsigned long index = addr - offsetof(struct user, fpu);
+ ret = put_fpu_long(child, index, data);
}
break;
@@ -367,23 +370,23 @@ long arch_ptrace(struct task_struct *child, long request,
return copy_regset_to_user(child, &user_sh64_native_view,
REGSET_GENERAL,
0, sizeof(struct pt_regs),
- (void __user *)data);
+ datap);
case PTRACE_SETREGS:
return copy_regset_from_user(child, &user_sh64_native_view,
REGSET_GENERAL,
0, sizeof(struct pt_regs),
- (const void __user *)data);
+ datap);
#ifdef CONFIG_SH_FPU
case PTRACE_GETFPREGS:
return copy_regset_to_user(child, &user_sh64_native_view,
REGSET_FPU,
0, sizeof(struct user_fpu_struct),
- (void __user *)data);
+ datap);
case PTRACE_SETFPREGS:
return copy_regset_from_user(child, &user_sh64_native_view,
REGSET_FPU,
0, sizeof(struct user_fpu_struct),
- (const void __user *)data);
+ datap);
#endif
default:
ret = ptrace_request(child, request, addr, data);
--
1.7.2.2
next prev parent reply other threads:[~2010-08-27 9:44 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-27 9:41 [RFC PATCH 00/43] ptrace cleanups Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 01/43] ptrace: change signature of sys_ptrace() and friends Namhyung Kim
2010-08-27 13:21 ` Arnd Bergmann
2010-08-27 15:55 ` Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 02/43] ptrace: cleanup ptrace_request() Namhyung Kim
2010-08-27 14:23 ` Arnd Bergmann
2010-08-27 16:13 ` Namhyung Kim
2010-08-27 19:26 ` Arnd Bergmann
2010-08-27 9:41 ` [RFC PATCH 03/43] ptrace: change signature of arch_ptrace() Namhyung Kim
2010-08-27 14:28 ` Arnd Bergmann
2010-08-27 16:20 ` Namhyung Kim
2010-08-29 13:40 ` Arnd Bergmann
2010-08-27 9:41 ` [RFC PATCH 04/43] ptrace, x86: " Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 05/43] ptrace, x86: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 06/43] ptrace, alpha: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 07/43] ptrace, arm: " Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 08/43] ptrace, arm: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 09/43] ptrace, avr32: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 10/43] ptrace, avr32: cleanup arch_ptrace() Namhyung Kim
2010-08-30 12:34 ` Haavard Skinnemoen
2010-08-27 9:41 ` [RFC PATCH 11/43] ptrace, blackfin: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 12/43] ptrace, cris-v10: " Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 13/43] ptrace, cris-v32: " Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 14/43] ptrace, frv: " Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 15/43] ptrace, frv: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 16/43] ptrace, h8300: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 17/43] ptrace, h8300: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 18/43] ptrace, ia64: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 19/43] ptrace, m32r: " Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 20/43] ptrace, m32r: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 21/43] ptrace, m68k: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 22/43] ptrace, m68k: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 23/43] ptrace, m68knommu: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 24/43] ptrace, m68knommu: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 25/43] ptrace, microblaze: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 26/43] ptrace, mips: " Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 27/43] ptrace, mips: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 28/43] ptrace, mn10300: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 29/43] ptrace, mn10300: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 30/43] ptrace, parisc: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 31/43] ptrace, powerpc: " Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 32/43] ptrace, powerpc: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 33/43] ptrace, s390: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 34/43] ptrace, score: " Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 35/43] ptrace, sh: " Namhyung Kim
2010-08-27 9:42 ` Namhyung Kim [this message]
2010-08-27 9:42 ` [RFC PATCH 37/43] ptrace, sparc: " Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 38/43] ptrace, sparc: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 39/43] ptrace, tile: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 40/43] ptrace, um: " Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 41/43] ptrace, um: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 42/43] ptrace, xtensa: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 43/43] ptrace, xtensa: cleanup arch_ptrace() Namhyung Kim
2010-08-27 11:01 ` [RFC PATCH 14/43] ptrace, frv: change signature of arch_ptrace() David Howells
2010-08-27 11:15 ` Namhyung Kim
2010-08-27 12:12 ` David Howells
2010-08-27 12:58 ` Namhyung Kim
2010-08-27 13:23 ` David Howells
2010-08-27 15:53 ` Namhyung Kim
2010-08-27 16:30 ` [RFC PATCH 00/43] ptrace cleanups Mike Frysinger
2010-08-30 0:14 ` Roland McGrath
2010-08-30 14:02 ` Namhyung Kim
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=1282902149-12991-37-git-send-email-namhyung@gmail.com \
--to=namhyung@gmail.com \
--cc=arnd@arndb.de \
--cc=lethal@linux-sh.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=roland@redhat.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®