From: Namhyung Kim <namhyung@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Roland McGrath <roland@redhat.com>,
Oleg Nesterov <oleg@redhat.com>,
linux-kernel@vger.kernel.org, Paul Mundt <lethal@linux-sh.org>
Subject: [PATCH RESEND v3 20/24] ptrace: cleanup arch_ptrace() on sh
Date: Thu, 30 Sep 2010 18:27:55 +0900 [thread overview]
Message-ID: <1285838880-4977-21-git-send-email-namhyung@gmail.com> (raw)
In-Reply-To: <1285838880-4977-1-git-send-email-namhyung@gmail.com>
Remove unnecessary castings and get rid of dummy pointer in favor of
offsetof() macro in ptrace_32.c. Also use temporary variables and
break long lines 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 | 19 ++++++++++++-------
2 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c
index 84c217c..b791460 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;
@@ -357,17 +356,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 - (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;
@@ -391,13 +393,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 - (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;
}
@@ -407,35 +411,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 1367134..1ee5ce6 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,15 @@ 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;
+ 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 +362,9 @@ 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;
+ index = addr - offsetof(struct user, fpu);
+ ret = put_fpu_long(child, index, data);
}
break;
@@ -367,23 +372,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-09-30 9:29 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-30 9:27 [PATCH RESEND v3 00/24] ptrace cleanups Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 01/24] ptrace: change signature of sys_ptrace() and friends Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 02/24] ptrace: cleanup ptrace_request() Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 03/24] ptrace: change signature of arch_ptrace() Namhyung Kim
2010-09-30 18:58 ` David Miller
2010-10-04 19:21 ` Geert Uytterhoeven
2010-09-30 9:27 ` [PATCH RESEND v3 04/24] ptrace: cleanup arch_ptrace() on x86 Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 05/24] ptrace: cleanup arch_ptrace() on ARM Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 06/24] ptrace: cleanup arch_ptrace() on avr32 Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 07/24] ptrace: cleanup arch_ptrace() and friends on Blackfin Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 08/24] ptrace: cleanup arch_ptrace() on cris Namhyung Kim
2010-09-30 10:36 ` Mikael Starvik
2010-09-30 9:27 ` [PATCH RESEND v3 09/24] ptrace: cleanup arch_ptrace() on frv Namhyung Kim
2010-10-02 3:18 ` Daniel K.
2010-10-02 3:57 ` Namhyung Kim
2010-10-02 4:59 ` Namhyung Kim
2010-10-02 6:13 ` Daniel K.
2010-09-30 9:27 ` [PATCH RESEND v3 10/24] ptrace: cleanup arch_ptrace() on h8300 Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 11/24] ptrace: cleanup arch_ptrace() on m32r Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 12/24] ptrace: cleanup arch_ptrace() on m68k Namhyung Kim
2010-10-04 19:22 ` Geert Uytterhoeven
2010-09-30 9:27 ` [PATCH RESEND v3 13/24] ptrace: cleanup arch_ptrace() on m68knommu Namhyung Kim
2010-10-04 23:42 ` Andrew Morton
2010-10-05 3:49 ` [PATCH UPDATED] " Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 14/24] ptrace: cleanup arch_ptrace() on microblaze Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 15/24] ptrace: cleanup arch_ptrace() on MIPS Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 16/24] ptrace: cleanup arch_ptrace() on mn10300 Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 17/24] ptrace: cleanup arch_ptrace() on parisc Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 18/24] ptrace: cleanup arch_ptrace() on powerpc Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 19/24] ptrace: cleanup arch_ptrace() on score Namhyung Kim
2010-09-30 9:27 ` Namhyung Kim [this message]
2010-09-30 9:27 ` [PATCH RESEND v3 21/24] ptrace: cleanup arch_ptrace() on sparc Namhyung Kim
2010-09-30 19:00 ` David Miller
2010-09-30 9:27 ` [PATCH RESEND v3 22/24] ptrace: cleanup arch_ptrace() on tile Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 23/24] ptrace: cleanup arch_ptrace() on um Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 24/24] ptrace: cleanup arch_ptrace() on xtensa 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=1285838880-4977-21-git-send-email-namhyung@gmail.com \
--to=namhyung@gmail.com \
--cc=akpm@linux-foundation.org \
--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®