From: Jan Kiszka <jan.kiszka@web.de>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] Re: [PATCH] factor out setting pc in gdbstub
Date: Mon, 30 Mar 2009 18:02:50 +0200 [thread overview]
Message-ID: <49D0ED2A.3020709@web.de> (raw)
In-Reply-To: <1238268672-6686-1-git-send-email-froydnj@codesourcery.com>
[-- Attachment #1: Type: text/plain, Size: 3363 bytes --]
Nathan Froyd wrote:
> The code for handling the c and s packets both contain code for setting
> the pc. Move that code out to a common function.
>
> Signed-off-by: Nathan Froyd <froydnj@codesourcery.com>
Yep, that makes it better.
Acked-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> gdbstub.c | 63 ++++++++++++++++++++++++------------------------------------
> 1 files changed, 25 insertions(+), 38 deletions(-)
>
> diff --git a/gdbstub.c b/gdbstub.c
> index 518c939..f6d2f1b 100644
> --- a/gdbstub.c
> +++ b/gdbstub.c
> @@ -1512,6 +1512,29 @@ static void gdb_breakpoint_remove_all(void)
> }
> }
>
> +static void gdb_set_cpu_pc(GDBState *s, target_ulong pc)
> +{
> +#if defined(TARGET_I386)
> + s->c_cpu->eip = pc;
> + cpu_synchronize_state(s->c_cpu, 1);
> +#elif defined (TARGET_PPC)
> + s->c_cpu->nip = pc;
> +#elif defined (TARGET_SPARC)
> + s->c_cpu->pc = pc;
> + s->c_cpu->npc = pc + 4;
> +#elif defined (TARGET_ARM)
> + s->c_cpu->regs[15] = pc;
> +#elif defined (TARGET_SH4)
> + s->c_cpu->pc = pc;
> +#elif defined (TARGET_MIPS)
> + s->c_cpu->active_tc.PC = pc;
> +#elif defined (TARGET_CRIS)
> + s->c_cpu->pc = pc;
> +#elif defined (TARGET_ALPHA)
> + s->c_cpu->pc = pc;
> +#endif
> +}
> +
> static int gdb_handle_packet(GDBState *s, const char *line_buf)
> {
> CPUState *env;
> @@ -1542,25 +1565,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf)
> case 'c':
> if (*p != '\0') {
> addr = strtoull(p, (char **)&p, 16);
> -#if defined(TARGET_I386)
> - s->c_cpu->eip = addr;
> - cpu_synchronize_state(s->c_cpu, 1);
> -#elif defined (TARGET_PPC)
> - s->c_cpu->nip = addr;
> -#elif defined (TARGET_SPARC)
> - s->c_cpu->pc = addr;
> - s->c_cpu->npc = addr + 4;
> -#elif defined (TARGET_ARM)
> - s->c_cpu->regs[15] = addr;
> -#elif defined (TARGET_SH4)
> - s->c_cpu->pc = addr;
> -#elif defined (TARGET_MIPS)
> - s->c_cpu->active_tc.PC = addr;
> -#elif defined (TARGET_CRIS)
> - s->c_cpu->pc = addr;
> -#elif defined (TARGET_ALPHA)
> - s->c_cpu->pc = addr;
> -#endif
> + gdb_set_cpu_pc(s, addr);
> }
> s->signal = 0;
> gdb_continue(s);
> @@ -1584,25 +1589,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf)
> case 's':
> if (*p != '\0') {
> addr = strtoull(p, (char **)&p, 16);
> -#if defined(TARGET_I386)
> - s->c_cpu->eip = addr;
> - cpu_synchronize_state(s->c_cpu, 1);
> -#elif defined (TARGET_PPC)
> - s->c_cpu->nip = addr;
> -#elif defined (TARGET_SPARC)
> - s->c_cpu->pc = addr;
> - s->c_cpu->npc = addr + 4;
> -#elif defined (TARGET_ARM)
> - s->c_cpu->regs[15] = addr;
> -#elif defined (TARGET_SH4)
> - s->c_cpu->pc = addr;
> -#elif defined (TARGET_MIPS)
> - s->c_cpu->active_tc.PC = addr;
> -#elif defined (TARGET_CRIS)
> - s->c_cpu->pc = addr;
> -#elif defined (TARGET_ALPHA)
> - s->c_cpu->pc = addr;
> -#endif
> + gdb_set_cpu_pc(s, addr);
> }
> cpu_single_step(s->c_cpu, sstep_flags);
> gdb_continue(s);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]
next prev parent reply other threads:[~2009-03-30 16:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-28 19:31 [Qemu-devel] [PATCH] factor out setting pc in gdbstub Nathan Froyd
2009-03-30 16:02 ` Jan Kiszka [this message]
2009-04-08 21:30 ` Aurelien Jarno
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=49D0ED2A.3020709@web.de \
--to=jan.kiszka@web.de \
--cc=qemu-devel@nongnu.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 NNTP newsgroup(s).