* [PULL 01/14] .travis.yml: show free disk space at end of run
2020-05-06 12:05 [PULL 00/14] testing and gdbstub updates Alex Bennée
@ 2020-05-06 12:05 ` Alex Bennée
2020-05-06 12:05 ` [PULL 02/14] .travis.yml: drop MacOSX Alex Bennée
` (13 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2020-05-06 12:05 UTC (permalink / raw)
To: peter.maydell
Cc: Fam Zheng, Philippe Mathieu-Daudé, Alex Bennée,
qemu-devel
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200501111505.4225-2-alex.bennee@linaro.org>
diff --git a/.travis.yml b/.travis.yml
index 2fd63eceaac..a4c3c6c8058 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -113,6 +113,7 @@ script:
$(exit $BUILD_RC);
fi
after_script:
+ - df -h
- if command -v ccache ; then ccache --show-stats ; fi
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PULL 02/14] .travis.yml: drop MacOSX
2020-05-06 12:05 [PULL 00/14] testing and gdbstub updates Alex Bennée
2020-05-06 12:05 ` [PULL 01/14] .travis.yml: show free disk space at end of run Alex Bennée
@ 2020-05-06 12:05 ` Alex Bennée
2020-05-06 12:05 ` [PULL 03/14] .cirrus.yml: bump FreeBSD to the current stable release Alex Bennée
` (12 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2020-05-06 12:05 UTC (permalink / raw)
To: peter.maydell
Cc: Fam Zheng, Philippe Mathieu-Daudé, Richard Henderson,
Alex Bennée, qemu-devel
This keeps breaking on Travis so lets just fall back to the Cirrus CI
builds which seem to be better maintained. Fix up the comments while
we are doing this as we never had a windows build.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200501111505.4225-3-alex.bennee@linaro.org>
diff --git a/.travis.yml b/.travis.yml
index a4c3c6c8058..49267b73b36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,8 @@ compiler:
cache:
# There is one cache per branch and compiler version.
# characteristics of each job are used to identify the cache:
- # - OS name (currently, linux, osx, or windows)
+ # - OS name (currently only linux)
# - OS distribution (for Linux, xenial, trusty, or precise)
- # - macOS image name (e.g., xcode7.2)
# - Names and values of visible environment variables set in .travis.yml or Settings panel
timeout: 1200
ccache: true
@@ -271,31 +270,6 @@ jobs:
- TEST_CMD=""
- # MacOSX builds - cirrus.yml also tests some MacOS builds including latest Xcode
-
- - name: "OSX Xcode 10.3"
- env:
- - BASE_CONFIG="--disable-docs --enable-tools"
- - CONFIG="--target-list=i386-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,x86_64-softmmu"
- os: osx
- osx_image: xcode10.3
- compiler: clang
- addons:
- homebrew:
- packages:
- - ccache
- - glib
- - pixman
- - gnu-sed
- - python
- update: true
- before_script:
- - brew link --overwrite python
- - export PATH="/usr/local/opt/ccache/libexec:$PATH"
- - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
- - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }
-
-
# Python builds
- name: "GCC Python 3.5 (x86_64-softmmu)"
env:
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PULL 03/14] .cirrus.yml: bump FreeBSD to the current stable release
2020-05-06 12:05 [PULL 00/14] testing and gdbstub updates Alex Bennée
2020-05-06 12:05 ` [PULL 01/14] .travis.yml: show free disk space at end of run Alex Bennée
2020-05-06 12:05 ` [PULL 02/14] .travis.yml: drop MacOSX Alex Bennée
@ 2020-05-06 12:05 ` Alex Bennée
2020-05-06 12:05 ` [PULL 04/14] .cirrus.yml: bootstrap pkg unconditionally Alex Bennée
` (11 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2020-05-06 12:05 UTC (permalink / raw)
To: peter.maydell; +Cc: Ed Maste, Alex Bennée, qemu-devel, Li-Wen Hsu
Hopefully this will un-stick the test which has been broken for a long
time.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Li-Wen Hsu <lwhsu@freebsd.org>
Tested-by: Li-Wen Hsu <lwhsu@freebsd.org>
Message-Id: <20200501111505.4225-4-alex.bennee@linaro.org>
diff --git a/.cirrus.yml b/.cirrus.yml
index 90645fede6b..f06f5af2b93 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -3,7 +3,7 @@ env:
freebsd_12_task:
freebsd_instance:
- image: freebsd-12-0-release-amd64
+ image_family: freebsd-12-1
cpu: 8
memory: 8G
install_script: pkg install -y
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PULL 04/14] .cirrus.yml: bootstrap pkg unconditionally
2020-05-06 12:05 [PULL 00/14] testing and gdbstub updates Alex Bennée
` (2 preceding siblings ...)
2020-05-06 12:05 ` [PULL 03/14] .cirrus.yml: bump FreeBSD to the current stable release Alex Bennée
@ 2020-05-06 12:05 ` Alex Bennée
2020-05-06 12:05 ` [PULL 05/14] .travis.yml: reduce the load on [ppc64] GCC check-tcg Alex Bennée
` (10 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2020-05-06 12:05 UTC (permalink / raw)
To: peter.maydell
Cc: Ed Maste, Li-Wen Hsu, Alex Bennée, qemu-devel, Li-Wen Hsu
From: Li-Wen Hsu <lwhsu@lwhsu.org>
This ensures compatibility with pkg repo so a change in upstream
doesn't break setup. See:
https://lists.freebsd.org/pipermail/freebsd-cloud/2020-April/000234.html
Message-Id: <CAKBkRUzicxphjjkkxdgzB3cDSv=AszD5V4X499jT2BjiAaazGw@mail.gmail.com>
Signed-off-by: Li-Wen Hsu <lwhsu@lwhsu.org>
[AJB: applied from Li-Wen's github, applied sob, tweaked commit message]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/.cirrus.yml b/.cirrus.yml
index f06f5af2b93..de0727cb097 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -6,7 +6,7 @@ freebsd_12_task:
image_family: freebsd-12-1
cpu: 8
memory: 8G
- install_script: pkg install -y
+ install_script: ASSUME_ALWAYS_YES=yes pkg bootstrap -f ; pkg install -y
bash bison curl cyrus-sasl git glib gmake gnutls gsed
nettle perl5 pixman pkgconf png usbredir
script:
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PULL 05/14] .travis.yml: reduce the load on [ppc64] GCC check-tcg
2020-05-06 12:05 [PULL 00/14] testing and gdbstub updates Alex Bennée
` (3 preceding siblings ...)
2020-05-06 12:05 ` [PULL 04/14] .cirrus.yml: bootstrap pkg unconditionally Alex Bennée
@ 2020-05-06 12:05 ` Alex Bennée
2020-05-06 12:05 ` [PULL 06/14] configure: favour gdb-multiarch if we have it Alex Bennée
` (9 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2020-05-06 12:05 UTC (permalink / raw)
To: peter.maydell
Cc: Fam Zheng, Richard Henderson, Alex Bennée, qemu-devel,
Philippe Mathieu-Daudé
This seems to be timing out quite often and occasionally running out
of disk space. Relegate it to light duties.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200501111505.4225-5-alex.bennee@linaro.org>
diff --git a/.travis.yml b/.travis.yml
index 49267b73b36..fe708792ca2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -458,7 +458,7 @@ jobs:
- genisoimage
env:
- TEST_CMD="make check check-tcg V=1"
- - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},ppc64le-linux-user"
+ - CONFIG="--disable-containers --target-list=ppc64-softmmu,ppc64le-linux-user"
- name: "[s390x] GCC check-tcg"
arch: s390x
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PULL 06/14] configure: favour gdb-multiarch if we have it
2020-05-06 12:05 [PULL 00/14] testing and gdbstub updates Alex Bennée
` (4 preceding siblings ...)
2020-05-06 12:05 ` [PULL 05/14] .travis.yml: reduce the load on [ppc64] GCC check-tcg Alex Bennée
@ 2020-05-06 12:05 ` Alex Bennée
2020-05-06 12:05 ` [PULL 07/14] gdbstub: Introduce gdb_get_float64() to get 64-bit float registers Alex Bennée
` (8 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2020-05-06 12:05 UTC (permalink / raw)
To: peter.maydell; +Cc: Philippe Mathieu-Daudé, Alex Bennée, qemu-devel
As gdb will generally be talking to "foreign" guests lets use that if
we can. Otherwise the chances of gdb barfing are considerably higher.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200430190122.4592-2-alex.bennee@linaro.org>
diff --git a/configure b/configure
index 23b5e93752b..c58787100f1 100755
--- a/configure
+++ b/configure
@@ -303,7 +303,7 @@ libs_qga=""
debug_info="yes"
stack_protector=""
use_containers="yes"
-gdb_bin=$(command -v "gdb")
+gdb_bin=$(command -v "gdb-multiarch" || command -v "gdb")
if test -e "$source_path/.git"
then
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PULL 07/14] gdbstub: Introduce gdb_get_float64() to get 64-bit float registers
2020-05-06 12:05 [PULL 00/14] testing and gdbstub updates Alex Bennée
` (5 preceding siblings ...)
2020-05-06 12:05 ` [PULL 06/14] configure: favour gdb-multiarch if we have it Alex Bennée
@ 2020-05-06 12:05 ` Alex Bennée
2020-05-06 12:05 ` [PULL 08/14] tests/tcg: better trap gdb failures Alex Bennée
` (7 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2020-05-06 12:05 UTC (permalink / raw)
To: peter.maydell
Cc: Philippe Mathieu-Daudé, qemu-devel, Laurent Vivier,
open list:PowerPC TCG CPUs, Alex Bennée, David Gibson
From: Philippe Mathieu-Daudé <philmd@redhat.com>
When converted to use GByteArray in commits 462474d760c and
a010bdbe719, the call to stfq_p() was removed. This call
serialize a float.
Since we now use a GByteArray, we can not use stfq_p() directly.
Introduce the gdb_get_float64() helper to load a float64 register.
Fixes: 462474d760c ("target/m68k: use gdb_get_reg helpers")
Fixes: a010bdbe719 ("extend GByteArray to read register helpers")
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200414163853.12164-3-philmd@redhat.com>
Message-Id: <20200430190122.4592-3-alex.bennee@linaro.org>
diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h
index 20e10726929..4a2b8e30893 100644
--- a/include/exec/gdbstub.h
+++ b/include/exec/gdbstub.h
@@ -134,6 +134,17 @@ static inline int gdb_get_float32(GByteArray *array, float32 val)
return sizeof(buf);
}
+
+static inline int gdb_get_float64(GByteArray *array, float64 val)
+{
+ uint8_t buf[sizeof(CPU_DoubleU)];
+
+ stfq_p(buf, val);
+ g_byte_array_append(array, buf, sizeof(buf));
+
+ return sizeof(buf);
+}
+
static inline int gdb_get_zeroes(GByteArray *array, size_t len)
{
guint oldlen = array->len;
diff --git a/target/m68k/helper.c b/target/m68k/helper.c
index cad40838956..79b0b10ea9b 100644
--- a/target/m68k/helper.c
+++ b/target/m68k/helper.c
@@ -72,7 +72,8 @@ static int cf_fpu_gdb_get_reg(CPUM68KState *env, GByteArray *mem_buf, int n)
{
if (n < 8) {
float_status s;
- return gdb_get_reg64(mem_buf, floatx80_to_float64(env->fregs[n].d, &s));
+ return gdb_get_float64(mem_buf,
+ floatx80_to_float64(env->fregs[n].d, &s));
}
switch (n) {
case 8: /* fpcontrol */
diff --git a/target/ppc/gdbstub.c b/target/ppc/gdbstub.c
index eb362dd9aec..5c11c88b2a8 100644
--- a/target/ppc/gdbstub.c
+++ b/target/ppc/gdbstub.c
@@ -130,7 +130,7 @@ int ppc_cpu_gdb_read_register(CPUState *cs, GByteArray *buf, int n)
gdb_get_regl(buf, env->gpr[n]);
} else if (n < 64) {
/* fprs */
- gdb_get_reg64(buf, *cpu_fpr_ptr(env, n - 32));
+ gdb_get_float64(buf, *cpu_fpr_ptr(env, n - 32));
} else {
switch (n) {
case 64:
@@ -184,7 +184,7 @@ int ppc_cpu_gdb_read_register_apple(CPUState *cs, GByteArray *buf, int n)
gdb_get_reg64(buf, env->gpr[n]);
} else if (n < 64) {
/* fprs */
- gdb_get_reg64(buf, *cpu_fpr_ptr(env, n - 32));
+ gdb_get_float64(buf, *cpu_fpr_ptr(env, n - 32));
} else if (n < 96) {
/* Altivec */
gdb_get_reg64(buf, n - 64);
diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c
index fd763e588ec..2b6e832c4c3 100644
--- a/target/ppc/translate_init.inc.c
+++ b/target/ppc/translate_init.inc.c
@@ -9881,7 +9881,7 @@ static int gdb_get_float_reg(CPUPPCState *env, GByteArray *buf, int n)
{
uint8_t *mem_buf;
if (n < 32) {
- gdb_get_reg64(buf, *cpu_fpr_ptr(env, n));
+ gdb_get_float64(buf, *cpu_fpr_ptr(env, n));
mem_buf = gdb_get_reg_ptr(buf, 8);
ppc_maybe_bswap_register(env, mem_buf, 8);
return 8;
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PULL 08/14] tests/tcg: better trap gdb failures
2020-05-06 12:05 [PULL 00/14] testing and gdbstub updates Alex Bennée
` (6 preceding siblings ...)
2020-05-06 12:05 ` [PULL 07/14] gdbstub: Introduce gdb_get_float64() to get 64-bit float registers Alex Bennée
@ 2020-05-06 12:05 ` Alex Bennée
2020-05-06 12:05 ` [PULL 09/14] tests/tcg: drop inferior.was_attached() test Alex Bennée
` (6 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2020-05-06 12:05 UTC (permalink / raw)
To: peter.maydell; +Cc: open list:ARM TCG CPUs, Alex Bennée, qemu-devel
It seems older and non-multiarach aware GDBs might not fail gracefully
when faced with something they don't know. For example when faced with
a target XML for s390x the Ubuntu 18.04 gdb will generate an internal
fault and prompt for a core dump.
Work around this by invoking GDB in a more batch orientated way and
then trying to filter out between test failures and gdb failures.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200430190122.4592-4-alex.bennee@linaro.org>
diff --git a/tests/guest-debug/run-test.py b/tests/guest-debug/run-test.py
index 8c49ee2f225..2bbb8fbaa38 100755
--- a/tests/guest-debug/run-test.py
+++ b/tests/guest-debug/run-test.py
@@ -50,8 +50,25 @@ if __name__ == '__main__':
inferior = subprocess.Popen(shlex.split(cmd))
# Now launch gdb with our test and collect the result
- gdb_cmd = "%s %s -ex 'target remote localhost:1234' -x %s" % (args.gdb, args.binary, args.test)
+ gdb_cmd = "%s %s" % (args.gdb, args.binary)
+ # run quietly and ignore .gdbinit
+ gdb_cmd += " -q -n -batch"
+ # disable prompts in case of crash
+ gdb_cmd += " -ex 'set confirm off'"
+ # connect to remote
+ gdb_cmd += " -ex 'target remote localhost:1234'"
+ # finally the test script itself
+ gdb_cmd += " -x %s" % (args.test)
+
+ print("GDB CMD: %s" % (gdb_cmd))
result = subprocess.call(gdb_cmd, shell=True);
+ # A negative result is the result of an internal gdb failure like
+ # a crash. We force a return of 0 so we don't fail the test on
+ # account of broken external tools.
+ if result < 0:
+ print("GDB crashed? SKIPPING")
+ exit(0)
+
exit(result)
diff --git a/tests/tcg/aarch64/gdbstub/test-sve-ioctl.py b/tests/tcg/aarch64/gdbstub/test-sve-ioctl.py
index 984fbeb277e..387b2fc20aa 100644
--- a/tests/tcg/aarch64/gdbstub/test-sve-ioctl.py
+++ b/tests/tcg/aarch64/gdbstub/test-sve-ioctl.py
@@ -70,7 +70,6 @@ except (gdb.error, AttributeError):
try:
# These are not very useful in scripts
gdb.execute("set pagination off")
- gdb.execute("set confirm off")
# Run the actual tests
run_test()
diff --git a/tests/tcg/aarch64/gdbstub/test-sve.py b/tests/tcg/aarch64/gdbstub/test-sve.py
index dbe7f2aa932..5995689625e 100644
--- a/tests/tcg/aarch64/gdbstub/test-sve.py
+++ b/tests/tcg/aarch64/gdbstub/test-sve.py
@@ -71,7 +71,6 @@ except (gdb.error, AttributeError):
try:
# These are not very useful in scripts
gdb.execute("set pagination off")
- gdb.execute("set confirm off")
# Run the actual tests
run_test()
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PULL 09/14] tests/tcg: drop inferior.was_attached() test
2020-05-06 12:05 [PULL 00/14] testing and gdbstub updates Alex Bennée
` (7 preceding siblings ...)
2020-05-06 12:05 ` [PULL 08/14] tests/tcg: better trap gdb failures Alex Bennée
@ 2020-05-06 12:05 ` Alex Bennée
2020-05-06 12:05 ` [PULL 10/14] gdbstub: eliminate gdbserver_fd global Alex Bennée
` (5 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2020-05-06 12:05 UTC (permalink / raw)
To: peter.maydell; +Cc: open list:ARM TCG CPUs, Alex Bennée, qemu-devel
This test seems flaky and reports attachment even when we failed to
negotiate the architecture. However the fetching of the guest
architecture will fail tripping up the gdb AttributeError which will
trigger our early no error status exit from the test
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200430190122.4592-5-alex.bennee@linaro.org>
diff --git a/tests/tcg/aarch64/gdbstub/test-sve-ioctl.py b/tests/tcg/aarch64/gdbstub/test-sve-ioctl.py
index 387b2fc20aa..972cf73c315 100644
--- a/tests/tcg/aarch64/gdbstub/test-sve-ioctl.py
+++ b/tests/tcg/aarch64/gdbstub/test-sve-ioctl.py
@@ -58,9 +58,6 @@ def run_test():
#
try:
inferior = gdb.selected_inferior()
- if inferior.was_attached == False:
- print("SKIPPING (failed to attach)", file=sys.stderr)
- exit(0)
arch = inferior.architecture()
report(arch.name() == "aarch64", "connected to aarch64")
except (gdb.error, AttributeError):
diff --git a/tests/tcg/aarch64/gdbstub/test-sve.py b/tests/tcg/aarch64/gdbstub/test-sve.py
index 5995689625e..b96bdbb99af 100644
--- a/tests/tcg/aarch64/gdbstub/test-sve.py
+++ b/tests/tcg/aarch64/gdbstub/test-sve.py
@@ -59,9 +59,6 @@ def run_test():
#
try:
inferior = gdb.selected_inferior()
- if inferior.was_attached == False:
- print("SKIPPING (failed to attach)", file=sys.stderr)
- exit(0)
arch = inferior.architecture()
report(arch.name() == "aarch64", "connected to aarch64")
except (gdb.error, AttributeError):
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PULL 10/14] gdbstub: eliminate gdbserver_fd global
2020-05-06 12:05 [PULL 00/14] testing and gdbstub updates Alex Bennée
` (8 preceding siblings ...)
2020-05-06 12:05 ` [PULL 09/14] tests/tcg: drop inferior.was_attached() test Alex Bennée
@ 2020-05-06 12:05 ` Alex Bennée
2020-05-06 12:05 ` [PULL 11/14] gdbstub/linux-user: support debugging over a unix socket Alex Bennée
` (4 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2020-05-06 12:05 UTC (permalink / raw)
To: peter.maydell
Cc: Philippe Mathieu-Daudé, Richard Henderson, Alex Bennée,
qemu-devel
We don't really need to track this fd beyond the initial creation of
the socket. We already know if the system has been initialised by
virtue of the gdbserver_state so lets remove it. This makes the later
re-factoring easier.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200430190122.4592-6-alex.bennee@linaro.org>
diff --git a/gdbstub.c b/gdbstub.c
index 171e1509509..b5381aa5204 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -398,8 +398,6 @@ static void reset_gdbserver_state(void)
bool gdb_has_xml;
#ifdef CONFIG_USER_ONLY
-/* XXX: This is not thread safe. Do we care? */
-static int gdbserver_fd = -1;
static int get_char(void)
{
@@ -2964,7 +2962,7 @@ void gdb_exit(CPUArchState *env, int code)
return;
}
#ifdef CONFIG_USER_ONLY
- if (gdbserver_fd < 0 || gdbserver_state.fd < 0) {
+ if (gdbserver_state.fd < 0) {
return;
}
#endif
@@ -3011,7 +3009,7 @@ gdb_handlesig(CPUState *cpu, int sig)
char buf[256];
int n;
- if (gdbserver_fd < 0 || gdbserver_state.fd < 0) {
+ if (!gdbserver_state.init || gdbserver_state.fd < 0) {
return sig;
}
@@ -3060,7 +3058,7 @@ void gdb_signalled(CPUArchState *env, int sig)
{
char buf[4];
- if (gdbserver_fd < 0 || gdbserver_state.fd < 0) {
+ if (!gdbserver_state.init || gdbserver_state.fd < 0) {
return;
}
@@ -3068,7 +3066,7 @@ void gdb_signalled(CPUArchState *env, int sig)
put_packet(buf);
}
-static bool gdb_accept(void)
+static bool gdb_accept(int gdb_fd)
{
struct sockaddr_in sockaddr;
socklen_t len;
@@ -3076,7 +3074,7 @@ static bool gdb_accept(void)
for(;;) {
len = sizeof(sockaddr);
- fd = accept(gdbserver_fd, (struct sockaddr *)&sockaddr, &len);
+ fd = accept(gdb_fd, (struct sockaddr *)&sockaddr, &len);
if (fd < 0 && errno != EINTR) {
perror("accept");
return false;
@@ -3137,13 +3135,13 @@ static int gdbserver_open(int port)
int gdbserver_start(int port)
{
- gdbserver_fd = gdbserver_open(port);
- if (gdbserver_fd < 0)
+ int gdb_fd = gdbserver_open(port);
+ if (gdb_fd < 0) {
return -1;
+ }
/* accept connections */
- if (!gdb_accept()) {
- close(gdbserver_fd);
- gdbserver_fd = -1;
+ if (!gdb_accept(gdb_fd)) {
+ close(gdb_fd);
return -1;
}
return 0;
@@ -3152,7 +3150,7 @@ int gdbserver_start(int port)
/* Disable gdb stub for child processes. */
void gdbserver_fork(CPUState *cpu)
{
- if (gdbserver_fd < 0 || gdbserver_state.fd < 0) {
+ if (!gdbserver_state.init || gdbserver_state.fd < 0) {
return;
}
close(gdbserver_state.fd);
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PULL 11/14] gdbstub/linux-user: support debugging over a unix socket
2020-05-06 12:05 [PULL 00/14] testing and gdbstub updates Alex Bennée
` (9 preceding siblings ...)
2020-05-06 12:05 ` [PULL 10/14] gdbstub: eliminate gdbserver_fd global Alex Bennée
@ 2020-05-06 12:05 ` Alex Bennée
2020-05-06 12:05 ` [PULL 12/14] tests/guest-debug: use the unix socket for linux-user tests Alex Bennée
` (3 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2020-05-06 12:05 UTC (permalink / raw)
To: peter.maydell
Cc: Philippe Mathieu-Daudé, Riku Voipio, Richard Henderson,
Laurent Vivier, qemu-devel, Alex Bennée
While debugging over TCP is fairly straightforward now we have test
cases that want to orchestrate via make and currently a parallel build
fails as two processes can't use the same listening port. While system
emulation offers a wide cornucopia of connection methods thanks to the
chardev abstraction we are a little more limited for linux user.
Thankfully the programming API for a TCP socket and a local UNIX
socket is pretty much the same once it's set up.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200430190122.4592-7-alex.bennee@linaro.org>
diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h
index 4a2b8e30893..94d8f83e92d 100644
--- a/include/exec/gdbstub.h
+++ b/include/exec/gdbstub.h
@@ -177,11 +177,15 @@ static inline uint8_t * gdb_get_reg_ptr(GByteArray *buf, int len)
#endif
-#ifdef CONFIG_USER_ONLY
-int gdbserver_start(int);
-#else
-int gdbserver_start(const char *port);
-#endif
+/**
+ * gdbserver_start: start the gdb server
+ * @port_or_device: connection spec for gdb
+ *
+ * For CONFIG_USER this is either a tcp port or a path to a fifo. For
+ * system emulation you can use a full chardev spec for your gdbserver
+ * port.
+ */
+int gdbserver_start(const char *port_or_device);
void gdbserver_cleanup(void);
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 770c2b267ad..28f122b80e6 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -738,7 +738,7 @@ int main(int argc, char **argv)
CPUState *cpu;
int optind;
const char *r;
- int gdbstub_port = 0;
+ const char *gdbstub = NULL;
char **target_environ, **wrk;
envlist_t *envlist = NULL;
char *trace_file = NULL;
@@ -814,7 +814,7 @@ int main(int argc, char **argv)
exit(1);
}
} else if (!strcmp(r, "g")) {
- gdbstub_port = atoi(argv[optind++]);
+ gdbstub = g_strdup(argv[optind++]);
} else if (!strcmp(r, "r")) {
qemu_uname_release = argv[optind++];
} else if (!strcmp(r, "cpu")) {
@@ -1124,8 +1124,8 @@ int main(int argc, char **argv)
#error unsupported target CPU
#endif
- if (gdbstub_port) {
- gdbserver_start (gdbstub_port);
+ if (gdbstub) {
+ gdbserver_start(gdbstub);
gdb_handlesig(cpu, 0);
}
cpu_loop(env);
diff --git a/gdbstub.c b/gdbstub.c
index b5381aa5204..6950fd243f3 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -355,6 +355,7 @@ typedef struct GDBState {
int signal;
#ifdef CONFIG_USER_ONLY
int fd;
+ char *socket_path;
int running_state;
#else
CharBackend chr;
@@ -2962,6 +2963,9 @@ void gdb_exit(CPUArchState *env, int code)
return;
}
#ifdef CONFIG_USER_ONLY
+ if (gdbserver_state.socket_path) {
+ unlink(gdbserver_state.socket_path);
+ }
if (gdbserver_state.fd < 0) {
return;
}
@@ -3066,7 +3070,66 @@ void gdb_signalled(CPUArchState *env, int sig)
put_packet(buf);
}
-static bool gdb_accept(int gdb_fd)
+static void gdb_accept_init(int fd)
+{
+ init_gdbserver_state();
+ create_default_process(&gdbserver_state);
+ gdbserver_state.processes[0].attached = true;
+ gdbserver_state.c_cpu = gdb_first_attached_cpu();
+ gdbserver_state.g_cpu = gdbserver_state.c_cpu;
+ gdbserver_state.fd = fd;
+ gdb_has_xml = false;
+}
+
+static bool gdb_accept_socket(int gdb_fd)
+{
+ int fd;
+
+ for(;;) {
+ fd = accept(gdb_fd, NULL, NULL);
+ if (fd < 0 && errno != EINTR) {
+ perror("accept socket");
+ return false;
+ } else if (fd >= 0) {
+ qemu_set_cloexec(fd);
+ break;
+ }
+ }
+
+ gdb_accept_init(fd);
+ return true;
+}
+
+static int gdbserver_open_socket(const char *path)
+{
+ struct sockaddr_un sockaddr;
+ int fd, ret;
+
+ fd = socket(AF_UNIX, SOCK_STREAM, 0);
+ if (fd < 0) {
+ perror("create socket");
+ return -1;
+ }
+
+ sockaddr.sun_family = AF_UNIX;
+ pstrcpy(sockaddr.sun_path, sizeof(sockaddr.sun_path) - 1, path);
+ ret = bind(fd, (struct sockaddr *)&sockaddr, sizeof(sockaddr));
+ if (ret < 0) {
+ perror("bind socket");
+ close(fd);
+ return -1;
+ }
+ ret = listen(fd, 1);
+ if (ret < 0) {
+ perror("listen socket");
+ close(fd);
+ return -1;
+ }
+
+ return fd;
+}
+
+static bool gdb_accept_tcp(int gdb_fd)
{
struct sockaddr_in sockaddr;
socklen_t len;
@@ -3091,17 +3154,11 @@ static bool gdb_accept(int gdb_fd)
return false;
}
- init_gdbserver_state();
- create_default_process(&gdbserver_state);
- gdbserver_state.processes[0].attached = true;
- gdbserver_state.c_cpu = gdb_first_attached_cpu();
- gdbserver_state.g_cpu = gdbserver_state.c_cpu;
- gdbserver_state.fd = fd;
- gdb_has_xml = false;
+ gdb_accept_init(fd);
return true;
}
-static int gdbserver_open(int port)
+static int gdbserver_open_port(int port)
{
struct sockaddr_in sockaddr;
int fd, ret;
@@ -3130,21 +3187,35 @@ static int gdbserver_open(int port)
close(fd);
return -1;
}
+
return fd;
}
-int gdbserver_start(int port)
+int gdbserver_start(const char *port_or_path)
{
- int gdb_fd = gdbserver_open(port);
+ int port = g_ascii_strtoull(port_or_path, NULL, 10);
+ int gdb_fd;
+
+ if (port > 0) {
+ gdb_fd = gdbserver_open_port(port);
+ } else {
+ gdb_fd = gdbserver_open_socket(port_or_path);
+ }
+
if (gdb_fd < 0) {
return -1;
}
- /* accept connections */
- if (!gdb_accept(gdb_fd)) {
- close(gdb_fd);
- return -1;
+
+ if (port > 0 && gdb_accept_tcp(gdb_fd)) {
+ return 0;
+ } else if (gdb_accept_socket(gdb_fd)) {
+ gdbserver_state.socket_path = g_strdup(port_or_path);
+ return 0;
}
- return 0;
+
+ /* gone wrong */
+ close(gdb_fd);
+ return -1;
}
/* Disable gdb stub for child processes. */
diff --git a/linux-user/main.c b/linux-user/main.c
index 22578b16336..2cd443237d8 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -51,7 +51,7 @@ char *exec_path;
int singlestep;
static const char *argv0;
-static int gdbstub_port;
+static const char *gdbstub;
static envlist_t *envlist;
static const char *cpu_model;
static const char *cpu_type;
@@ -310,7 +310,7 @@ static void handle_arg_seed(const char *arg)
static void handle_arg_gdb(const char *arg)
{
- gdbstub_port = atoi(arg);
+ gdbstub = g_strdup(arg);
}
static void handle_arg_uname(const char *arg)
@@ -861,10 +861,10 @@ int main(int argc, char **argv, char **envp)
target_cpu_copy_regs(env, regs);
- if (gdbstub_port) {
- if (gdbserver_start(gdbstub_port) < 0) {
- fprintf(stderr, "qemu: could not open gdbserver on port %d\n",
- gdbstub_port);
+ if (gdbstub) {
+ if (gdbserver_start(gdbstub) < 0) {
+ fprintf(stderr, "qemu: could not open gdbserver on %s\n",
+ gdbstub);
exit(EXIT_FAILURE);
}
gdb_handlesig(cpu, 0);
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PULL 12/14] tests/guest-debug: use the unix socket for linux-user tests
2020-05-06 12:05 [PULL 00/14] testing and gdbstub updates Alex Bennée
` (10 preceding siblings ...)
2020-05-06 12:05 ` [PULL 11/14] gdbstub/linux-user: support debugging over a unix socket Alex Bennée
@ 2020-05-06 12:05 ` Alex Bennée
2020-05-06 12:05 ` [PULL 13/14] tests/tcg: add a multiarch linux-user gdb test Alex Bennée
` (2 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2020-05-06 12:05 UTC (permalink / raw)
To: peter.maydell; +Cc: Alex Bennée, qemu-devel
Now we have support for debugging over a unix socket for linux-user
lets use it in our test harness.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200430190122.4592-8-alex.bennee@linaro.org>
diff --git a/tests/guest-debug/run-test.py b/tests/guest-debug/run-test.py
index 2bbb8fbaa38..d9af9573b9e 100755
--- a/tests/guest-debug/run-test.py
+++ b/tests/guest-debug/run-test.py
@@ -15,6 +15,8 @@ import argparse
import subprocess
import shutil
import shlex
+import os
+from tempfile import TemporaryDirectory
def get_args():
parser = argparse.ArgumentParser(description="A gdbstub test runner")
@@ -41,11 +43,15 @@ if __name__ == '__main__':
print("We need gdb to run the test")
exit(-1)
+ socket_dir = TemporaryDirectory("qemu-gdbstub")
+ socket_name = os.path.join(socket_dir.name, "gdbstub.socket")
+
# Launch QEMU with binary
if "system" in args.qemu:
cmd = "%s %s %s -s -S" % (args.qemu, args.qargs, args.binary)
else:
- cmd = "%s %s -g 1234 %s" % (args.qemu, args.qargs, args.binary)
+ cmd = "%s %s -g %s %s" % (args.qemu, args.qargs, socket_name,
+ args.binary)
inferior = subprocess.Popen(shlex.split(cmd))
@@ -56,7 +62,10 @@ if __name__ == '__main__':
# disable prompts in case of crash
gdb_cmd += " -ex 'set confirm off'"
# connect to remote
- gdb_cmd += " -ex 'target remote localhost:1234'"
+ if "system" in args.qemu:
+ gdb_cmd += " -ex 'target remote localhost:1234'"
+ else:
+ gdb_cmd += " -ex 'target remote %s'" % (socket_name)
# finally the test script itself
gdb_cmd += " -x %s" % (args.test)
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PULL 13/14] tests/tcg: add a multiarch linux-user gdb test
2020-05-06 12:05 [PULL 00/14] testing and gdbstub updates Alex Bennée
` (11 preceding siblings ...)
2020-05-06 12:05 ` [PULL 12/14] tests/guest-debug: use the unix socket for linux-user tests Alex Bennée
@ 2020-05-06 12:05 ` Alex Bennée
2020-05-06 12:05 ` [PULL 14/14] target/m68k: fix gdb for m68xxx Alex Bennée
2020-05-06 14:37 ` [PULL 00/14] testing and gdbstub updates Peter Maydell
14 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2020-05-06 12:05 UTC (permalink / raw)
To: peter.maydell
Cc: Richard Henderson, open list:ARM TCG CPUs, Alex Bennée,
qemu-devel, Edgar E. Iglesias
When the gdbstub code was converted to the new API we missed a few
snafus in the various guests. Add a simple gdb test script which can
be used on all our linux-user guests to check for obvious failures.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200430190122.4592-9-alex.bennee@linaro.org>
diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target
index d99b2a9eced..312f36cde5f 100644
--- a/tests/tcg/aarch64/Makefile.target
+++ b/tests/tcg/aarch64/Makefile.target
@@ -54,9 +54,6 @@ sve-ioctls: CFLAGS+=-march=armv8.1-a+sve
ifneq ($(HAVE_GDB_BIN),)
GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py
-AARCH64_TESTS += gdbstub-sysregs gdbstub-sve-ioctls
-
-.PHONY: gdbstub-sysregs gdbstub-sve-ioctls
run-gdbstub-sysregs: sysregs
$(call run-test, $@, $(GDB_SCRIPT) \
--gdb $(HAVE_GDB_BIN) \
@@ -70,6 +67,8 @@ run-gdbstub-sve-ioctls: sve-ioctls
--qemu $(QEMU) --qargs "$(QEMU_OPTS)" \
--bin $< --test $(AARCH64_SRC)/gdbstub/test-sve-ioctl.py, \
"basic gdbstub SVE ZLEN support")
+
+EXTRA_RUNS += run-gdbstub-sysregs run-gdbstub-sve-ioctls
endif
endif
diff --git a/tests/tcg/cris/Makefile.target b/tests/tcg/cris/Makefile.target
index 24c7f2e7616..e72d3cbdb23 100644
--- a/tests/tcg/cris/Makefile.target
+++ b/tests/tcg/cris/Makefile.target
@@ -23,6 +23,7 @@ CRIS_RUNS = $(patsubst %, run-%, $(CRIS_USABLE_TESTS))
# override the list of tests, as we can't build the multiarch tests
TESTS = $(CRIS_USABLE_TESTS)
+EXTRA_RUNS =
VPATH = $(CRIS_SRC)
AS = $(CC) -x assembler-with-cpp
diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target
index 035b09c8533..51fb75ecfdd 100644
--- a/tests/tcg/multiarch/Makefile.target
+++ b/tests/tcg/multiarch/Makefile.target
@@ -42,5 +42,19 @@ run-test-mmap-%: test-mmap
$(call run-test, test-mmap-$*, $(QEMU) -p $* $<,\
"$< ($* byte pages) on $(TARGET_NAME)")
+ifneq ($(HAVE_GDB_BIN),)
+GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py
+
+run-gdbstub-sha1: sha1
+ $(call run-test, $@, $(GDB_SCRIPT) \
+ --gdb $(HAVE_GDB_BIN) \
+ --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \
+ --bin $< --test $(MULTIARCH_SRC)/gdbstub/sha1.py, \
+ "basic gdbstub support")
+
+EXTRA_RUNS += run-gdbstub-sha1
+endif
+
+
# Update TESTS
TESTS += $(MULTIARCH_TESTS)
diff --git a/tests/tcg/multiarch/gdbstub/sha1.py b/tests/tcg/multiarch/gdbstub/sha1.py
new file mode 100644
index 00000000000..734553b98bb
--- /dev/null
+++ b/tests/tcg/multiarch/gdbstub/sha1.py
@@ -0,0 +1,81 @@
+from __future__ import print_function
+#
+# A very simple smoke test for debugging the SHA1 userspace test on
+# each target.
+#
+# This is launched via tests/guest-debug/run-test.py
+#
+
+import gdb
+import sys
+
+initial_vlen = 0
+failcount = 0
+
+def report(cond, msg):
+ "Report success/fail of test"
+ if cond:
+ print("PASS: %s" % (msg))
+ else:
+ print("FAIL: %s" % (msg))
+ global failcount
+ failcount += 1
+
+def check_break(sym_name):
+ "Setup breakpoint, continue and check we stopped."
+ sym, ok = gdb.lookup_symbol(sym_name)
+ bp = gdb.Breakpoint(sym_name)
+
+ gdb.execute("c")
+
+ # hopefully we came back
+ end_pc = gdb.parse_and_eval('$pc')
+ report(bp.hit_count == 1,
+ "break @ %s (%s %d hits)" % (end_pc, sym.value(), bp.hit_count))
+
+ bp.delete()
+
+def run_test():
+ "Run through the tests one by one"
+
+ check_break("SHA1Init")
+
+ # check step and inspect values
+ gdb.execute("next")
+ val_ctx = gdb.parse_and_eval("context->state[0]")
+ exp_ctx = 0x67452301
+ report(int(val_ctx) == exp_ctx, "context->state[0] == %x" % exp_ctx);
+
+ gdb.execute("next")
+ val_ctx = gdb.parse_and_eval("context->state[1]")
+ exp_ctx = 0xEFCDAB89
+ report(int(val_ctx) == exp_ctx, "context->state[1] == %x" % exp_ctx);
+
+ # finally check we don't barf inspecting registers
+ gdb.execute("info registers")
+
+#
+# This runs as the script it sourced (via -x, via run-test.py)
+#
+try:
+ inferior = gdb.selected_inferior()
+ arch = inferior.architecture()
+ print("ATTACHED: %s" % arch.name())
+except (gdb.error, AttributeError):
+ print("SKIPPING (not connected)", file=sys.stderr)
+ exit(0)
+
+try:
+ # These are not very useful in scripts
+ gdb.execute("set pagination off")
+ gdb.execute("set confirm off")
+
+ # Run the actual tests
+ run_test()
+except (gdb.error):
+ print ("GDB Exception: %s" % (sys.exc_info()[0]))
+ failcount += 1
+ pass
+
+print("All tests complete: %d failures" % failcount)
+exit(failcount)
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PULL 14/14] target/m68k: fix gdb for m68xxx
2020-05-06 12:05 [PULL 00/14] testing and gdbstub updates Alex Bennée
` (12 preceding siblings ...)
2020-05-06 12:05 ` [PULL 13/14] tests/tcg: add a multiarch linux-user gdb test Alex Bennée
@ 2020-05-06 12:05 ` Alex Bennée
2020-05-06 14:37 ` [PULL 00/14] testing and gdbstub updates Peter Maydell
14 siblings, 0 replies; 16+ messages in thread
From: Alex Bennée @ 2020-05-06 12:05 UTC (permalink / raw)
To: peter.maydell
Cc: Alex Bennée, Richard Henderson, qemu-devel, Laurent Vivier,
KONRAD Frederic, Philippe Mathieu-Daudé
From: KONRAD Frederic <frederic.konrad@adacore.com>
Currently "cf-core.xml" is sent to GDB when using any m68k flavor. Thing is
it uses the "org.gnu.gdb.coldfire.core" feature name and gdb 8.3 then expects
a coldfire FPU instead of the default m68881 FPU.
This is not OK because the m68881 floats registers are 96 bits wide so it
crashes GDB with the following error message:
(gdb) target remote localhost:7960
Remote debugging using localhost:7960
warning: Register "fp0" has an unsupported size (96 bits)
warning: Register "fp1" has an unsupported size (96 bits)
...
Remote 'g' packet reply is too long (expected 148 bytes, got 180 bytes): \
00000000000[...]0000
With this patch: qemu-system-m68k -M none -cpu m68020 -s -S
(gdb) tar rem :1234
Remote debugging using :1234
warning: No executable has been specified and target does not support
determining executable automatically. Try using the "file" command.
0x00000000 in ?? ()
(gdb) p $fp0
$1 = nan(0xffffffffffffffff)
Signed-off-by: KONRAD Frederic <frederic.konrad@adacore.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <1588094279-17913-3-git-send-email-frederic.konrad@adacore.com>
Message-Id: <20200430190122.4592-10-alex.bennee@linaro.org>
diff --git a/configure b/configure
index c58787100f1..0d69c360c0e 100755
--- a/configure
+++ b/configure
@@ -7825,7 +7825,7 @@ case "$target_name" in
;;
m68k)
bflt="yes"
- gdb_xml_files="cf-core.xml cf-fp.xml m68k-fp.xml"
+ gdb_xml_files="cf-core.xml cf-fp.xml m68k-core.xml m68k-fp.xml"
TARGET_SYSTBL_ABI=common
;;
microblaze|microblazeel)
diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c
index 9445fcd6df5..72c545149e9 100644
--- a/target/m68k/cpu.c
+++ b/target/m68k/cpu.c
@@ -292,16 +292,38 @@ static void m68k_cpu_class_init(ObjectClass *c, void *data)
cc->tcg_initialize = m68k_tcg_init;
cc->gdb_num_core_regs = 18;
- cc->gdb_core_xml_file = "cf-core.xml";
dc->vmsd = &vmstate_m68k_cpu;
}
-#define DEFINE_M68K_CPU_TYPE(cpu_model, initfn) \
- { \
- .name = M68K_CPU_TYPE_NAME(cpu_model), \
- .instance_init = initfn, \
- .parent = TYPE_M68K_CPU, \
+static void m68k_cpu_class_init_cf_core(ObjectClass *c, void *data)
+{
+ CPUClass *cc = CPU_CLASS(c);
+
+ cc->gdb_core_xml_file = "cf-core.xml";
+}
+
+#define DEFINE_M68K_CPU_TYPE_CF(model) \
+ { \
+ .name = M68K_CPU_TYPE_NAME(#model), \
+ .instance_init = model##_cpu_initfn, \
+ .parent = TYPE_M68K_CPU, \
+ .class_init = m68k_cpu_class_init_cf_core \
+ }
+
+static void m68k_cpu_class_init_m68k_core(ObjectClass *c, void *data)
+{
+ CPUClass *cc = CPU_CLASS(c);
+
+ cc->gdb_core_xml_file = "m68k-core.xml";
+}
+
+#define DEFINE_M68K_CPU_TYPE_M68K(model) \
+ { \
+ .name = M68K_CPU_TYPE_NAME(#model), \
+ .instance_init = model##_cpu_initfn, \
+ .parent = TYPE_M68K_CPU, \
+ .class_init = m68k_cpu_class_init_m68k_core \
}
static const TypeInfo m68k_cpus_type_infos[] = {
@@ -314,15 +336,15 @@ static const TypeInfo m68k_cpus_type_infos[] = {
.class_size = sizeof(M68kCPUClass),
.class_init = m68k_cpu_class_init,
},
- DEFINE_M68K_CPU_TYPE("m68000", m68000_cpu_initfn),
- DEFINE_M68K_CPU_TYPE("m68020", m68020_cpu_initfn),
- DEFINE_M68K_CPU_TYPE("m68030", m68030_cpu_initfn),
- DEFINE_M68K_CPU_TYPE("m68040", m68040_cpu_initfn),
- DEFINE_M68K_CPU_TYPE("m68060", m68060_cpu_initfn),
- DEFINE_M68K_CPU_TYPE("m5206", m5206_cpu_initfn),
- DEFINE_M68K_CPU_TYPE("m5208", m5208_cpu_initfn),
- DEFINE_M68K_CPU_TYPE("cfv4e", cfv4e_cpu_initfn),
- DEFINE_M68K_CPU_TYPE("any", any_cpu_initfn),
+ DEFINE_M68K_CPU_TYPE_M68K(m68000),
+ DEFINE_M68K_CPU_TYPE_M68K(m68020),
+ DEFINE_M68K_CPU_TYPE_M68K(m68030),
+ DEFINE_M68K_CPU_TYPE_M68K(m68040),
+ DEFINE_M68K_CPU_TYPE_M68K(m68060),
+ DEFINE_M68K_CPU_TYPE_CF(m5206),
+ DEFINE_M68K_CPU_TYPE_CF(m5208),
+ DEFINE_M68K_CPU_TYPE_CF(cfv4e),
+ DEFINE_M68K_CPU_TYPE_CF(any),
};
DEFINE_TYPES(m68k_cpus_type_infos)
diff --git a/gdb-xml/m68k-core.xml b/gdb-xml/m68k-core.xml
new file mode 100644
index 00000000000..5b092d26de0
--- /dev/null
+++ b/gdb-xml/m68k-core.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2008 Free Software Foundation, Inc.
+
+ Copying and distribution of this file, with or without modification,
+ are permitted in any medium without royalty provided the copyright
+ notice and this notice are preserved. -->
+<!DOCTYPE feature SYSTEM "gdb-target.dtd">
+<feature name="org.gnu.gdb.m68k.core">
+ <reg name="d0" bitsize="32"/>
+ <reg name="d1" bitsize="32"/>
+ <reg name="d2" bitsize="32"/>
+ <reg name="d3" bitsize="32"/>
+ <reg name="d4" bitsize="32"/>
+ <reg name="d5" bitsize="32"/>
+ <reg name="d6" bitsize="32"/>
+ <reg name="d7" bitsize="32"/>
+ <reg name="a0" bitsize="32" type="data_ptr"/>
+ <reg name="a1" bitsize="32" type="data_ptr"/>
+ <reg name="a2" bitsize="32" type="data_ptr"/>
+ <reg name="a3" bitsize="32" type="data_ptr"/>
+ <reg name="a4" bitsize="32" type="data_ptr"/>
+ <reg name="a5" bitsize="32" type="data_ptr"/>
+ <reg name="fp" bitsize="32" type="data_ptr"/>
+ <reg name="sp" bitsize="32" type="data_ptr"/>
+
+ <reg name="ps" bitsize="32"/>
+ <reg name="pc" bitsize="32" type="code_ptr"/>
+
+</feature>
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PULL 00/14] testing and gdbstub updates
2020-05-06 12:05 [PULL 00/14] testing and gdbstub updates Alex Bennée
` (13 preceding siblings ...)
2020-05-06 12:05 ` [PULL 14/14] target/m68k: fix gdb for m68xxx Alex Bennée
@ 2020-05-06 14:37 ` Peter Maydell
14 siblings, 0 replies; 16+ messages in thread
From: Peter Maydell @ 2020-05-06 14:37 UTC (permalink / raw)
To: Alex Bennée; +Cc: QEMU Developers
On Wed, 6 May 2020 at 13:05, Alex Bennée <alex.bennee@linaro.org> wrote:
>
> The following changes since commit f19d118bed77bb95681b07f4e76dbb700c16918d:
>
> Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2020-05-04' into staging (2020-05-05 15:47:44 +0100)
>
> are available in the Git repository at:
>
> https://github.com/stsquad/qemu.git tags/pull-testing-and-gdbstub-060520-1
>
> for you to fetch changes up to a976ed3ffdede7f64c89ac235d0154d048981b5f:
>
> target/m68k: fix gdb for m68xxx (2020-05-06 09:29:26 +0100)
>
> ----------------------------------------------------------------
> Testing and gdbstub updates:
>
> - travis: drop macosx, tweak ppc64 native
> - cirrus: fix FreeBSD, guard against future breakage
> - gdbstub: support socket debug for linux-user
> - gdbstub: add multiarch tests
> - gdbstub: fixes for m68k
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 16+ messages in thread