Commit da92e236 authored by Jon Doron's avatar Jon Doron Committed by Alex Bennée
Browse files

gdbstub: Implement read memory (m pkt) with new infra 



Signed-off-by: default avatarJon Doron <arilou@gmail.com>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Message-Id: <20190529064148.19856-12-arilou@gmail.com>
Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
parent cc0ecc78

gdbstub.c

+32 −16
Original line number Diff line number Diff line
@@ -1731,6 +1731,30 @@ static void handle_write_mem(GdbCmdContext *gdb_ctx, void *user_ctx) 
    put_packet(gdb_ctx->s, "OK");

}



static void handle_read_mem(GdbCmdContext *gdb_ctx, void *user_ctx)

{

    if (gdb_ctx->num_params != 2) {

        put_packet(gdb_ctx->s, "E22");

        return;

    }



    /* memtohex() doubles the required space */

    if (gdb_ctx->params[1].val_ull > MAX_PACKET_LENGTH / 2) {

        put_packet(gdb_ctx->s, "E22");

        return;

    }



    if (target_memory_rw_debug(gdb_ctx->s->g_cpu, gdb_ctx->params[0].val_ull,

                               gdb_ctx->mem_buf,

                               gdb_ctx->params[1].val_ull, false)) {

        put_packet(gdb_ctx->s, "E14");

        return;

    }



    memtohex(gdb_ctx->str_buf, gdb_ctx->mem_buf, gdb_ctx->params[1].val_ull);

    put_packet(gdb_ctx->s, gdb_ctx->str_buf);

}



static int gdb_handle_packet(GDBState *s, const char *line_buf)

{

    CPUState *cpu;
@@ -1920,22 +1944,14 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) 
        put_packet(s, "OK");

        break;

    case 'm':

        addr = strtoull(p, (char **)&p, 16);

        if (*p == ',')

            p++;

        len = strtoull(p, NULL, 16);



        /* memtohex() doubles the required space */

        if (len > MAX_PACKET_LENGTH / 2) {

            put_packet (s, "E22");

            break;

        }



        if (target_memory_rw_debug(s->g_cpu, addr, mem_buf, len, false) != 0) {

            put_packet (s, "E14");

        } else {

            memtohex(buf, mem_buf, len);

            put_packet(s, buf);

        {

            static const GdbCmdParseEntry read_mem_cmd_desc = {

                .handler = handle_read_mem,

                .cmd = "m",

                .cmd_startswith = 1,

                .schema = "L,L0"

            };

            cmd_parser = &read_mem_cmd_desc;

        }

        break;

    case 'M':