Commit 92148134 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-and-gdbstub-170320-1' into staging 



Testing and gdbstub updates:

  - docker updates for VirGL
  - re-factor gdbstub for static GDBState
  - re-factor gdbstub for dynamic arrays
  - add SVE support to arm gdbstub
  - add some guest debug tests to check-tcg
  - add aarch64 userspace register tests
  - remove packet size limit to gdbstub
  - simplify gdbstub monitor code
  - report vContSupported in gdbstub to use proper single-step

# gpg: Signature made Tue 17 Mar 2020 17:47:46 GMT
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-testing-and-gdbstub-170320-1: (28 commits)
  gdbstub: Fix single-step issue by confirming 'vContSupported+' feature to gdb
  gdbstub: do not split gdb_monitor_write payload
  gdbstub: change GDBState.last_packet to GByteArray
  tests/tcg/aarch64: add test-sve-ioctl guest-debug test
  tests/tcg/aarch64: add SVE iotcl test
  tests/tcg/aarch64: add a gdbstub testcase for SVE registers
  tests/guest-debug: add a simple test runner
  configure: allow user to specify what gdb to use
  tests/tcg/aarch64: userspace system register test
  target/arm: don't bother with id_aa64pfr0_read for USER_ONLY
  target/arm: generate xml description of our SVE registers
  target/arm: default SVE length to 64 bytes for linux-user
  target/arm: explicitly encode regnum in our XML
  target/arm: prepare for multiple dynamic XMLs
  gdbstub: extend GByteArray to read register helpers
  target/i386: use gdb_get_reg helpers
  target/m68k: use gdb_get_reg helpers
  target/arm: use gdb_get_reg helpers
  gdbstub: add helper for 128 bit registers
  gdbstub: move mem_buf to GDBState and use GByteArray
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents cf4b6440 3bc2609d

.travis.yml

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ env: 
    - MAIN_SOFTMMU_TARGETS="aarch64-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"

    - CCACHE_SLOPPINESS="include_file_ctime,include_file_mtime"

    - CCACHE_MAXSIZE=1G

    - G_MESSAGES_DEBUG=error





git:

configure

+9 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ libs_qga="" 
debug_info="yes"

stack_protector=""

use_containers="yes"

gdb_bin=$(command -v "gdb")



if test -e "$source_path/.git"

then
@@ -1598,6 +1599,8 @@ for opt do 
  ;;

  --disable-fuzzing) fuzzing=no

  ;;

  --gdb=*) gdb_bin="$optarg"

  ;;

  *)

      echo "ERROR: unknown option $opt"

      echo "Try '$0 --help' for more information"
@@ -1783,6 +1786,7 @@ Advanced options (experts only): 
  --enable-plugins

                           enable plugins via shared library loading

  --disable-containers     don't use containers for cross-building

  --gdb=GDB-path           gdb to use for gdbstub tests [$gdb_bin]



Optional features, enabled with --enable-FEATURE and

disabled with --disable-FEATURE, default is enabled if available:
@@ -6785,6 +6789,7 @@ echo "libudev $libudev" 
echo "default devices   $default_devices"

echo "plugin support    $plugins"

echo "fuzzing support   $fuzzing"

echo "gdb               $gdb_bin"



if test "$supported_cpu" = "no"; then

    echo
@@ -7666,6 +7671,10 @@ if test "$plugins" = "yes" ; then 
    fi

fi



if test -n "$gdb_bin" ; then

    echo "HAVE_GDB_BIN=$gdb_bin" >> $config_host_mak

fi



if test "$tcg_interpreter" = "yes"; then

  QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/tci $QEMU_INCLUDES"

elif test "$ARCH" = "sparc64" ; then

gdbstub.c

+455 −481

File changed.

Preview size limit exceeded, changes collapsed.

hw/core/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static int cpu_common_write_elf64_note(WriteCoreDumpFunction f, 
}





static int cpu_common_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg)

static int cpu_common_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg)

{

    return 0;

}

include/exec/gdbstub.h

+49 −13
Original line number Diff line number Diff line
@@ -68,40 +68,76 @@ void gdb_signalled(CPUArchState *, int); 
void gdbserver_fork(CPUState *);

#endif

/* Get or set a register.  Returns the size of the register.  */

typedef int (*gdb_reg_cb)(CPUArchState *env, uint8_t *buf, int reg);

typedef int (*gdb_get_reg_cb)(CPUArchState *env, GByteArray *buf, int reg);

typedef int (*gdb_set_reg_cb)(CPUArchState *env, uint8_t *buf, int reg);

void gdb_register_coprocessor(CPUState *cpu,

                              gdb_reg_cb get_reg, gdb_reg_cb set_reg,

                              gdb_get_reg_cb get_reg, gdb_set_reg_cb set_reg,

                              int num_regs, const char *xml, int g_pos);



/* The GDB remote protocol transfers values in target byte order.  This means

 * we can use the raw memory access routines to access the value buffer.

 * Conveniently, these also handle the case where the buffer is mis-aligned.

/*

 * The GDB remote protocol transfers values in target byte order. As

 * the gdbstub may be batching up several register values we always

 * append to the array.

 */



static inline int gdb_get_reg8(uint8_t *mem_buf, uint8_t val)

static inline int gdb_get_reg8(GByteArray *buf, uint8_t val)

{

    stb_p(mem_buf, val);

    g_byte_array_append(buf, &val, 1);

    return 1;

}



static inline int gdb_get_reg16(uint8_t *mem_buf, uint16_t val)

static inline int gdb_get_reg16(GByteArray *buf, uint16_t val)

{

    stw_p(mem_buf, val);

    uint16_t to_word = tswap16(val);

    g_byte_array_append(buf, (uint8_t *) &to_word, 2);

    return 2;

}



static inline int gdb_get_reg32(uint8_t *mem_buf, uint32_t val)

static inline int gdb_get_reg32(GByteArray *buf, uint32_t val)

{

    stl_p(mem_buf, val);

    uint32_t to_long = tswap32(val);

    g_byte_array_append(buf, (uint8_t *) &to_long, 4);

    return 4;

}



static inline int gdb_get_reg64(uint8_t *mem_buf, uint64_t val)

static inline int gdb_get_reg64(GByteArray *buf, uint64_t val)

{

    stq_p(mem_buf, val);

    uint64_t to_quad = tswap64(val);

    g_byte_array_append(buf, (uint8_t *) &to_quad, 8);

    return 8;

}



static inline int gdb_get_reg128(GByteArray *buf, uint64_t val_hi,

                                 uint64_t val_lo)

{

    uint64_t to_quad;

#ifdef TARGET_WORDS_BIGENDIAN

    to_quad = tswap64(val_hi);

    g_byte_array_append(buf, (uint8_t *) &to_quad, 8);

    to_quad = tswap64(val_lo);

    g_byte_array_append(buf, (uint8_t *) &to_quad, 8);

#else

    to_quad = tswap64(val_lo);

    g_byte_array_append(buf, (uint8_t *) &to_quad, 8);

    to_quad = tswap64(val_hi);

    g_byte_array_append(buf, (uint8_t *) &to_quad, 8);

#endif

    return 16;

}



/**

 * gdb_get_reg_ptr: get pointer to start of last element

 * @len: length of element

 *

 * This is a helper function to extract the pointer to the last

 * element for additional processing. Some front-ends do additional

 * dynamic swapping of the elements based on CPU state.

 */

static inline uint8_t * gdb_get_reg_ptr(GByteArray *buf, int len)

{

    return buf->data + buf->len - len;

}



#if TARGET_LONG_BITS == 64

#define gdb_get_regl(buf, val) gdb_get_reg64(buf, val)

#define ldtul_p(addr) ldq_p(addr)