From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Damien Hedde" <damien.hedde@greensocs.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-arm@nongnu.org, "Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v5 21/22] gdbstub: change GDBState.last_packet to GByteArray
Date: Tue, 14 Jan 2020 15:09:52 +0000 [thread overview]
Message-ID: <20200114150953.27659-22-alex.bennee@linaro.org> (raw)
In-Reply-To: <20200114150953.27659-1-alex.bennee@linaro.org>
From: Damien Hedde <damien.hedde@greensocs.com>
Remove the packet size upper limit by using a GByteArray
instead of a statically allocated array for last_packet.
Thus we can now send big packets.
Also remove the last_packet_len field and use last_packet->len
instead.
Signed-off-by: Damien Hedde <damien.hedde@greensocs.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191211160514.58373-2-damien.hedde@greensocs.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
gdbstub.c | 39 +++++++++++++++++++++------------------
1 file changed, 21 insertions(+), 18 deletions(-)
diff --git a/gdbstub.c b/gdbstub.c
index dcfa4f1dd7..b9fb8c0a95 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -351,8 +351,7 @@ typedef struct GDBState {
int line_buf_index;
int line_sum; /* running checksum */
int line_csum; /* checksum at the end of the packet */
- uint8_t last_packet[MAX_PACKET_LENGTH + 4];
- int last_packet_len;
+ GByteArray *last_packet;
int signal;
#ifdef CONFIG_USER_ONLY
int fd;
@@ -384,6 +383,7 @@ static void init_gdbserver_state(void)
gdbserver_state.init = true;
gdbserver_state.str_buf = g_string_new(NULL);
gdbserver_state.mem_buf = g_byte_array_sized_new(MAX_PACKET_LENGTH);
+ gdbserver_state.last_packet = g_byte_array_sized_new(MAX_PACKET_LENGTH + 4);
}
#ifndef CONFIG_USER_ONLY
@@ -626,28 +626,29 @@ static void hexdump(const char *buf, int len,
static int put_packet_binary(const char *buf, int len, bool dump)
{
int csum, i;
- uint8_t *p;
- uint8_t *ps = &gdbserver_state.last_packet[0];
+ uint8_t footer[3];
if (dump && trace_event_get_state_backends(TRACE_GDBSTUB_IO_BINARYREPLY)) {
hexdump(buf, len, trace_gdbstub_io_binaryreply);
}
for(;;) {
- p = ps;
- *(p++) = '$';
- memcpy(p, buf, len);
- p += len;
+ g_byte_array_set_size(gdbserver_state.last_packet, 0);
+ g_byte_array_append(gdbserver_state.last_packet,
+ (const uint8_t *) "$", 1);
+ g_byte_array_append(gdbserver_state.last_packet,
+ (const uint8_t *) buf, len);
csum = 0;
for(i = 0; i < len; i++) {
csum += buf[i];
}
- *(p++) = '#';
- *(p++) = tohex((csum >> 4) & 0xf);
- *(p++) = tohex((csum) & 0xf);
+ footer[0] = '#';
+ footer[1] = tohex((csum >> 4) & 0xf);
+ footer[2] = tohex((csum) & 0xf);
+ g_byte_array_append(gdbserver_state.last_packet, footer, 3);
- gdbserver_state.last_packet_len = p - ps;
- put_buffer(ps, gdbserver_state.last_packet_len);
+ put_buffer(gdbserver_state.last_packet->data,
+ gdbserver_state.last_packet->len);
#ifdef CONFIG_USER_ONLY
i = get_char();
@@ -2812,20 +2813,22 @@ static void gdb_read_byte(uint8_t ch)
uint8_t reply;
#ifndef CONFIG_USER_ONLY
- if (gdbserver_state.last_packet_len) {
+ if (gdbserver_state.last_packet->len) {
/* Waiting for a response to the last packet. If we see the start
of a new command then abandon the previous response. */
if (ch == '-') {
trace_gdbstub_err_got_nack();
- put_buffer((uint8_t *)gdbserver_state.last_packet, gdbserver_state.last_packet_len);
+ put_buffer(gdbserver_state.last_packet->data,
+ gdbserver_state.last_packet->len);
} else if (ch == '+') {
trace_gdbstub_io_got_ack();
} else {
trace_gdbstub_io_got_unexpected(ch);
}
- if (ch == '+' || ch == '$')
- gdbserver_state.last_packet_len = 0;
+ if (ch == '+' || ch == '$') {
+ g_byte_array_set_size(gdbserver_state.last_packet, 0);
+ }
if (ch != '$')
return;
}
@@ -3209,7 +3212,7 @@ static int gdb_monitor_write(Chardev *chr, const uint8_t *buf, int len)
const char *p = (const char *)buf;
int max_sz;
- max_sz = (sizeof(gdbserver_state.last_packet) - 2) / 2;
+ max_sz = (MAX_PACKET_LENGTH / 2) + 1;
for (;;) {
if (len <= max_sz) {
gdb_monitor_output(p, len);
--
2.20.1
next prev parent reply other threads:[~2020-01-14 15:27 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-14 15:09 [PATCH v5 00/22] gdbstub refactor and SVE support (+check-tcg tweaks) Alex Bennée
2020-01-14 15:09 ` [PATCH v5 01/22] gdbstub: make GDBState static and have common init function Alex Bennée
2020-01-14 15:09 ` [PATCH v5 02/22] gdbstub: stop passing GDBState * around and use global Alex Bennée
2020-01-16 10:05 ` Damien Hedde
2020-01-16 15:07 ` Philippe Mathieu-Daudé
2020-01-14 15:09 ` [PATCH v5 03/22] gdbstub: move str_buf to GDBState and use GString Alex Bennée
2020-01-14 15:09 ` [PATCH v5 04/22] gdbstub: move mem_buf to GDBState and use GByteArray Alex Bennée
2020-01-14 15:09 ` [PATCH v5 05/22] gdbstub: add helper for 128 bit registers Alex Bennée
2020-01-14 15:09 ` [PATCH v5 06/22] target/arm: use gdb_get_reg helpers Alex Bennée
2020-01-14 15:09 ` [PATCH v5 07/22] target/m68k: " Alex Bennée
2020-01-14 15:09 ` [PATCH v5 08/22] gdbstub: extend GByteArray to read register helpers Alex Bennée
2020-01-15 5:53 ` David Gibson
2020-01-16 9:58 ` Damien Hedde
2020-01-14 15:09 ` [PATCH v5 09/22] target/arm: prepare for multiple dynamic XMLs Alex Bennée
2020-01-15 22:21 ` Richard Henderson
2020-01-14 15:09 ` [PATCH v5 10/22] target/arm: explicitly encode regnum in our XML Alex Bennée
2020-01-14 15:09 ` [PATCH v5 11/22] target/arm: default SVE length to 64 bytes for linux-user Alex Bennée
2020-01-14 15:09 ` [PATCH v5 12/22] target/arm: generate xml description of our SVE registers Alex Bennée
2020-01-15 22:16 ` Richard Henderson
2020-01-14 15:09 ` [PATCH v5 13/22] tests/tcg: add a configure compiler check for ARMv8.1 and SVE Alex Bennée
2020-01-15 22:24 ` Richard Henderson
2020-01-14 15:09 ` [PATCH v5 14/22] target/arm: don't bother with id_aa64pfr0_read for USER_ONLY Alex Bennée
2020-01-14 15:09 ` [PATCH v5 15/22] tests/tcg/aarch64: userspace system register test Alex Bennée
2020-01-15 22:30 ` Richard Henderson
2020-01-14 15:09 ` [PATCH v5 16/22] configure: allow user to specify what gdb to use Alex Bennée
2020-01-15 22:31 ` Richard Henderson
2020-01-14 15:09 ` [PATCH v5 17/22] tests/guest-debug: add a simple test runner Alex Bennée
2020-01-15 22:40 ` Richard Henderson
2020-01-15 22:43 ` Richard Henderson
2020-01-14 15:09 ` [PATCH v5 18/22] tests/tcg/aarch64: add a gdbstub testcase for SVE registers Alex Bennée
2020-01-15 22:54 ` Richard Henderson
2020-01-16 7:36 ` Alex Bennée
2020-01-14 15:09 ` [PATCH v5 19/22] tests/tcg/aarch64: add SVE iotcl test Alex Bennée
2020-01-15 22:46 ` Richard Henderson
2020-01-14 15:09 ` [PATCH v5 20/22] tests/tcg/aarch64: add test-sve-ioctl guest-debug test Alex Bennée
2020-01-15 23:07 ` Richard Henderson
2020-02-04 21:45 ` Alex Bennée
2020-02-05 10:19 ` Richard Henderson
2020-02-05 11:49 ` Andrew Jones
2020-01-14 15:09 ` Alex Bennée [this message]
2020-01-15 23:10 ` [PATCH v5 21/22] gdbstub: change GDBState.last_packet to GByteArray Richard Henderson
2020-01-14 15:09 ` [PATCH v5 22/22] gdbstub: do not split gdb_monitor_write payload Alex Bennée
2020-01-15 23:11 ` Richard Henderson
2020-01-14 18:57 ` [PATCH v5 00/22] gdbstub refactor and SVE support (+check-tcg tweaks) no-reply
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=20200114150953.27659-22-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=damien.hedde@greensocs.com \
--cc=philmd@redhat.com \
--cc=qemu-arm@nongnu.org \
--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).