Commit 4614f0f8 authored Nov 19, 2018 by Max Filippov

target/xtensa: gdbstub fix register counting



In order to communicate correctly with gdb xtensa gdbstub must provide
expected number of registers in 'g' packet response. xtensa-elf-gdb
expects both nonprivileged and privileged registers. xtensa-linux-gdb
only expects nonprivileged registers. gdb only counts one contiguous
stretch of registers, do the same for the core registers in the
xtensa_count_regs.

With this change qemu-system-xtensa is able to communicate with all
xtensa-elf-gdb versions (versions prior to 8.2 require overlay fixup),
and qemu-xtensa is able to communicate with all xtensa-linux-gdb
versions, except 8.2.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>

parent 47c1cc30

target/xtensa/gdbstub.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -45,15 +45,20 @@ void xtensa_count_regs(const XtensaConfig *config,
		unsigned n_regs, unsigned n_core_regs)
		{
		unsigned i;
		bool count_core_regs = true;

		for (i = 0; config->gdb_regmap.reg[i].targno >= 0; ++i) {
		if (config->gdb_regmap.reg[i].type != xtRegisterTypeTieState &&
		config->gdb_regmap.reg[i].type != xtRegisterTypeMapped &&
		config->gdb_regmap.reg[i].type != xtRegisterTypeUnmapped) {
		++*n_regs;
		if (count_core_regs) {
		if ((config->gdb_regmap.reg[i].flags &
		XTENSA_REGISTER_FLAGS_PRIVILEGED) == 0) {
		++*n_core_regs;
		} else {
		count_core_regs = false;
		}
		}
		}
		}