From patchwork Tue Mar 17 17:50:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184661 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4451361ile; Tue, 17 Mar 2020 11:10:35 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtZd1rFGfXOzV5nAPkb+nCvnU7m9DdGOMM0BkeQg+0kChMQVbFPcYNrpcHusYXGVWXB/kaS X-Received: by 2002:ac8:7955:: with SMTP id r21mr364638qtt.289.1584468635427; Tue, 17 Mar 2020 11:10:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584468635; cv=none; d=google.com; s=arc-20160816; b=wNWSA7KntdJAE3C5VtKoIx76dxbMMfmfPgDbsrA4qA6g1QPE6j7m85KP67+qlSZo9G DKZaHRMfuxMiEual1FziWJMRMMPQFDnoCpDD19t3+zh7mT6DIkBDpdl9e0RT3UfIGvoz +NgG+j2Cxuk/1k7O6tscoGSy+ZrYhHl/L8CzP3lS6K+gHaocwUmg2smjpl7Wi83Zru/x 2K3jI4uqh0yL0F84lEkRjCyi5S4YdF1t7Hh+beYuOobduMK1mxW955kAK37yqt7AApDp BowYyVnI8ayTsB/41nBbezmTGDJVjPLH75GPRRYsF9N8koAu0ydwl0EnEh0epR7U86eO LudA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=iBvEUDncqC3Mv+jQK3irHfsoAQSqaRXgCJbGIbs+9L0=; b=hON/Bs/n4Xw8hZHju8gYlnnz2yiHqO3J5tnjfFJZdIcr9ptuXgwVhxbql/pqU49x5v 8l21n8eCZ6H7hPGWjRwzyHU/MQJLHVgCYxukd4xVTXANi8OpNvOWH741YdF9za1meBeo UhWwBDbHHiAOyi79v58Mru3RAcn/YFou87s+GE0llWLxumjr3QdUvwIgWgtG+LUc0s4r kbuo68UaoXtwe70JkhqZRz2tKqK+mrfhrwyJsg4CUSgn3Vayjf5sM/xJuDYPeNVebaQs fNyUMLRedlkc78aa5KMJ+5gPdR9gg/yqo53M0kOsMZcNr2+dw90UiULPsy8sts8oSA2A PXHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cjMefkL6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f13si2533753qte.88.2020.03.17.11.10.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Mar 2020 11:10:35 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cjMefkL6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEGfi-0002rZ-V1 for patch@linaro.org; Tue, 17 Mar 2020 14:10:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36692) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEGUU-0005az-Tq for qemu-devel@nongnu.org; Tue, 17 Mar 2020 13:59:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEGUT-0000Jq-GA for qemu-devel@nongnu.org; Tue, 17 Mar 2020 13:58:58 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:33219) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEGUT-0000C2-7s for qemu-devel@nongnu.org; Tue, 17 Mar 2020 13:58:57 -0400 Received: by mail-wr1-x430.google.com with SMTP id a25so26922032wrd.0 for ; Tue, 17 Mar 2020 10:58:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iBvEUDncqC3Mv+jQK3irHfsoAQSqaRXgCJbGIbs+9L0=; b=cjMefkL6PhJUwi3KUx2Azk+AC6dnATdahMTgg26tZVAblnujyci6NtDK37CfVOR82c RTbCCOvvaVt2CF/Md/YcF16R/5UTz1bxKbLq5GlPGLcibnm240l8tNf8bBg1xP5YjpZC ywslHOvy6og+gQN9XEHpC/ST1ekVC1hVPXMcjuM5N5wTIBGnLL2uBtBZ+5b07yDQ0ZyA duC66lyDLm1bd8AR1oZFVePLaSbpv7ocvl+JJTZiAKCy3p8iGed7vJCSYlRM2HzNUD93 D4yg7ADL+wUdQsprudIPQYZSAwuH3Z8jkhJtMCem4jyhi74cLWxgtfAawGT0lbsn9gc4 R+Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iBvEUDncqC3Mv+jQK3irHfsoAQSqaRXgCJbGIbs+9L0=; b=NRVU+6ogFnGBrYWu201b0LEOH6nNMw1IpCKIJgrI33n+TrLMN1KoX9gNrnmBb/JtNm G53Ejdt5hrbVFx+FjGRbJB5/GcT80U1NwZMC1flOA4sLytVo9pdXX+O385W+k4UPWYLL QpVVQdjJEM5sRh0Mx/dDskjGkqKZN2coLKN+g0RdE3gZtLxjztTFYVqlgfWiOqGDUCZL b9LNiZYak+SJVEivGFJko0SZeJodYgJR+bItSdEjjMfFo3fczDuiBZgrTjBBU/XXYJNt x0ebkuQ230t0MQ4niGrDPQmRdssH8jp0RQ7bY8rgg8TNqTbckXdrYIN3ZJQMJuQ8Ef3d u9yg== X-Gm-Message-State: ANhLgQ1u9rfuGgwQbmBXoAL6O8B+LJl1vrml945iZ25NOPMpbUBMA9cQ mot+T/UC/etsyhxkU8r2hNlXuQ== X-Received: by 2002:adf:a3d3:: with SMTP id m19mr145865wrb.377.1584467936142; Tue, 17 Mar 2020 10:58:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k3sm5216743wro.59.2020.03.17.10.58.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 10:58:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EB9751FFB1; Tue, 17 Mar 2020 17:50:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 26/28] gdbstub: change GDBState.last_packet to GByteArray Date: Tue, 17 Mar 2020 17:50:51 +0000 Message-Id: <20200317175053.5278-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317175053.5278-1-alex.bennee@linaro.org> References: <20200317175053.5278-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Damien Hedde , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Damien Hedde 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 Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20191211160514.58373-2-damien.hedde@greensocs.com> Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20200316172155.971-27-alex.bennee@linaro.org> -- 2.20.1 diff --git a/gdbstub.c b/gdbstub.c index 0bcfc47a7c5..a60ef5125eb 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);