diff options
| author | Philippe Mathieu-Daudé | 2020-04-14 22:06:26 +0200 |
|---|---|---|
| committer | Alex Bennée | 2020-04-15 12:38:23 +0200 |
| commit | 7b8c1527ae0a9ec96a9100a05c680b55eb3aa54f (patch) | |
| tree | 9db5c80184c6b62d8492638b8221ca2acd3ccb88 | |
| parent | gdbstub: i386: Fix gdb_get_reg16() parameter to unbreak gdb (diff) | |
| download | qemu-7b8c1527ae0a9ec96a9100a05c680b55eb3aa54f.tar.gz qemu-7b8c1527ae0a9ec96a9100a05c680b55eb3aa54f.tar.xz qemu-7b8c1527ae0a9ec96a9100a05c680b55eb3aa54f.zip | |
gdbstub: Do not use memset() on GByteArray
Introduce gdb_get_zeroes() to fill a GByteArray with zeroes.
Fixes: a010bdbe719 ("extend GByteArray to read register helpers")
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200414102427.7459-1-philmd@redhat.com>
[AJB: used slightly more gliby set_size approach]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200414200631.12799-13-alex.bennee@linaro.org>
| -rw-r--r-- | include/exec/gdbstub.h | 9 | ||||
| -rw-r--r-- | target/arm/gdbstub.c | 3 | ||||
| -rw-r--r-- | target/xtensa/gdbstub.c | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index 30b909ebd2..3c452fc50c 100644 --- a/include/exec/gdbstub.h +++ b/include/exec/gdbstub.h @@ -125,6 +125,15 @@ static inline int gdb_get_reg128(GByteArray *buf, uint64_t val_hi, return 16; } +static inline int gdb_get_zeroes(GByteArray *array, size_t len) +{ + guint oldlen = array->len; + g_byte_array_set_size(array, oldlen + len); + memset(array->data + oldlen, 0, len); + + return len; +} + /** * gdb_get_reg_ptr: get pointer to start of last element * @len: length of element diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c index 8efc535f2a..063551df23 100644 --- a/target/arm/gdbstub.c +++ b/target/arm/gdbstub.c @@ -47,8 +47,7 @@ int arm_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) if (gdb_has_xml) { return 0; } - memset(mem_buf, 0, 12); - return 12; + return gdb_get_zeroes(mem_buf, 12); } switch (n) { case 24: diff --git a/target/xtensa/gdbstub.c b/target/xtensa/gdbstub.c index 0ee3feabe5..4d43f1340a 100644 --- a/target/xtensa/gdbstub.c +++ b/target/xtensa/gdbstub.c @@ -105,8 +105,7 @@ int xtensa_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) default: qemu_log_mask(LOG_UNIMP, "%s from reg %d of unsupported size %d\n", __func__, n, reg->size); - memset(mem_buf, 0, reg->size); - return reg->size; + return gdb_get_zeroes(mem_buf, reg->size); } case xtRegisterTypeWindow: /*a*/ @@ -115,8 +114,7 @@ int xtensa_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) default: qemu_log_mask(LOG_UNIMP, "%s from reg %d of unsupported type %d\n", __func__, n, reg->type); - memset(mem_buf, 0, reg->size); - return reg->size; + return gdb_get_zeroes(mem_buf, reg->size); } } |