From: Yao Qi <qiyaoltc@gmail.com>
To: Antoine Tremblay <antoine.tremblay@ericsson.com>
Cc: <gdb-patches@sourceware.org>
Subject: Re: [PATCH v7 4/8] Refactor arm_software_single_step to use regcache.
Date: Fri, 11 Dec 2015 11:37:00 -0000 [thread overview]
Message-ID: <86egetqkrg.fsf@gmail.com> (raw)
In-Reply-To: <1449583641-18156-5-git-send-email-antoine.tremblay@ericsson.com> (Antoine Tremblay's message of "Tue, 8 Dec 2015 09:07:17 -0500")
Antoine Tremblay <antoine.tremblay@ericsson.com> writes:
Hi Antoine,
Patch is OK to me, two nits below.
> diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c
> index acb5701..eb4341c 100644
> --- a/gdb/arm-linux-tdep.c
> +++ b/gdb/arm-linux-tdep.c
> @@ -808,6 +808,68 @@ arm_linux_sigreturn_return_addr (struct frame_info *frame,
> return 0;
> }
>
> +/* Calculate the offset from stack pointer of the pc register on the stack
> + in the case of a sigreturn or sigreturn_rt syscall. */
> +static int
> +arm_linux_sigreturn_next_pc_offset (unsigned long sp,
> + unsigned long sp_data,
> + unsigned long svc_number,
> + int is_sigreturn)
> +{
> + /* Offset of R0 register. */
> + int r0_offset = 0;
> + /* Offset of PC register. */
> + int pc_offset = 0;
> +
> + if (is_sigreturn)
> + {
> + if (sp_data == ARM_NEW_SIGFRAME_MAGIC)
> + r0_offset = ARM_UCONTEXT_SIGCONTEXT + ARM_SIGCONTEXT_R0;
> + else
> + r0_offset = ARM_SIGCONTEXT_R0;
> + }
> + else
> + {
> + if (sp_data == sp + ARM_OLD_RT_SIGFRAME_SIGINFO)
> + r0_offset = ARM_OLD_RT_SIGFRAME_UCONTEXT + ARM_UCONTEXT_SIGCONTEXT
> + + ARM_SIGCONTEXT_R0;
> + else
> + r0_offset = ARM_NEW_RT_SIGFRAME_UCONTEXT + ARM_UCONTEXT_SIGCONTEXT
> + + ARM_SIGCONTEXT_R0;
Nit: we can write these long lines like this,
if (sp_data == sp + ARM_OLD_RT_SIGFRAME_SIGINFO)
r0_offset = ARM_OLD_RT_SIGFRAME_UCONTEXT;
else
r0_offset = ARM_NEW_RT_SIGFRAME_UCONTEXT;
r0_offset += (ARM_UCONTEXT_SIGCONTEXT + ARM_SIGCONTEXT_R0);
>
> - arm_linux_sigreturn_return_addr (frame, svc_number, &return_addr, &is_thumb);
> + if (is_syscall (gdbarch, "sigreturn", svc_number)
> + || is_syscall (gdbarch, "rt_sigreturn", svc_number))
> + next_pc = arm_linux_sigreturn_next_pc (regcache, svc_number);
>
> /* Addresses for calling Thumb functions have the bit 0 set. */
> if (is_thumb)
> - return_addr |= 1;
> + next_pc |= 1;
Nit: use MAKE_THUMB_ADDR.
--
Yao (齐尧)
next prev parent reply other threads:[~2015-12-11 11:37 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-08 14:07 [PATCH v7 0/8] Support software single step and conditional breakpoints on ARM in GDBServer Antoine Tremblay
2015-12-08 14:07 ` [PATCH v7 2/8] Share some ARM target dependent code from GDB with GDBServer Antoine Tremblay
2015-12-08 14:07 ` [PATCH v7 5/8] Share regcache function regcache_raw_read_unsigned Antoine Tremblay
2015-12-08 14:07 ` [PATCH v7 1/8] Replace breakpoint_reinsert_addr by get_next_pcs operation in GDBServer Antoine Tremblay
2015-12-08 14:07 ` [PATCH v7 4/8] Refactor arm_software_single_step to use regcache Antoine Tremblay
2015-12-11 11:37 ` Yao Qi [this message]
2015-12-11 12:41 ` Antoine Tremblay
2015-12-08 14:07 ` [PATCH v7 3/8] Use xml-syscall to compare syscall numbers in arm_linux_sigreturn_return-addr Antoine Tremblay
2015-12-11 11:29 ` Yao Qi
2015-12-11 11:59 ` Pedro Alves
2015-12-11 12:02 ` Yao Qi
2015-12-11 12:05 ` Pedro Alves
2015-12-11 12:31 ` Antoine Tremblay
2015-12-11 12:47 ` Pedro Alves
2015-12-11 13:04 ` Antoine Tremblay
2015-12-11 13:20 ` Pedro Alves
2015-12-11 13:25 ` Antoine Tremblay
2015-12-15 12:46 ` Antoine Tremblay
2015-12-16 15:59 ` Pedro Alves
2015-12-16 16:36 ` Yao Qi
2015-12-16 16:37 ` Antoine Tremblay
2015-12-11 12:29 ` Antoine Tremblay
2015-12-16 15:59 ` Pedro Alves
2015-12-16 16:05 ` Antoine Tremblay
2015-12-16 16:24 ` [PATCH v7.1 " Antoine Tremblay
2015-12-17 10:09 ` Yao Qi
2015-12-17 10:17 ` Pedro Alves
2015-12-17 12:51 ` Antoine Tremblay
2015-12-17 13:25 ` Yao Qi
2015-12-17 13:36 ` Antoine Tremblay
2015-12-08 14:08 ` [PATCH v7 7/8] Enable software single stepping for while-stepping actions in GDBServer Antoine Tremblay
2015-12-08 14:08 ` [PATCH v7 6/8] Support software single step on ARM " Antoine Tremblay
2015-12-09 20:09 ` [PATCH v7.1] " Antoine Tremblay
2015-12-11 13:28 ` Yao Qi
2015-12-11 13:36 ` Antoine Tremblay
2015-12-11 13:41 ` Antoine Tremblay
2015-12-11 14:45 ` Yao Qi
2015-12-11 14:43 ` Yao Qi
2015-12-11 15:06 ` Antoine Tremblay
2015-12-11 15:26 ` Antoine Tremblay
2015-12-11 15:38 ` Yao Qi
2015-12-11 16:11 ` Antoine Tremblay
2015-12-11 16:26 ` [PATCH v7.2] " Antoine Tremblay
2015-12-11 17:28 ` Yao Qi
2015-12-11 17:52 ` Antoine Tremblay
2015-12-08 14:08 ` [PATCH v7 8/8] Enable conditional breakpoints for targets that support software single step " Antoine Tremblay
2015-12-10 15:59 ` [PATCH v7 0/8] Support software single step and conditional breakpoints on ARM " Yao Qi
2015-12-10 16:02 ` Antoine Tremblay
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=86egetqkrg.fsf@gmail.com \
--to=qiyaoltc@gmail.com \
--cc=antoine.tremblay@ericsson.com \
--cc=gdb-patches@sourceware.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: 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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).