From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Julian Ganz" <neither@nut.email>,
"Daniel Henrique Barboza" <dbarboza@ventanamicro.com>,
"Alistair Francis" <alistair.francis@wdc.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Weiwei Li" <liwei1518@gmail.com>,
"Liu Zhiwei" <zhiwei_liu@linux.alibaba.com>,
qemu-riscv@nongnu.org (open list:RISC-V TCG CPUs)
Subject: [PULL 30/35] tests: add test for double-traps on rv64
Date: Wed, 29 Oct 2025 15:50:39 +0000 [thread overview]
Message-ID: <20251029155045.257802-31-alex.bennee@linaro.org> (raw)
In-Reply-To: <20251029155045.257802-1-alex.bennee@linaro.org>
From: Julian Ganz <neither@nut.email>
We do have a number of test-case for various architectures exercising
their interrupt/exception logic. However, for the recently introduced
trap API we also want to exercise the logic for double traps on at least
one architecture.
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Julian Ganz <neither@nut.email>
Message-ID: <20251027110344.2289945-31-alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/tests/tcg/riscv64/Makefile.softmmu-target b/tests/tcg/riscv64/Makefile.softmmu-target
index 3ca595335dd..d9c0036eb4b 100644
--- a/tests/tcg/riscv64/Makefile.softmmu-target
+++ b/tests/tcg/riscv64/Makefile.softmmu-target
@@ -24,5 +24,11 @@ EXTRA_RUNS += run-test-mepc-masking
run-test-mepc-masking: test-mepc-masking
$(call run-test, $<, $(QEMU) $(QEMU_OPTS)$<)
+EXTRA_RUNS += run-plugin-doubletrap
+run-plugin-doubletrap: doubletrap
+ $(call run-test, $<, \
+ $(QEMU) -plugin ../plugins/libdiscons.so -d plugin -D $<.pout \
+ $(QEMU_OPTS)$<)
+
# We don't currently support the multiarch system tests
undefine MULTIARCH_TESTS
diff --git a/tests/tcg/riscv64/doubletrap.S b/tests/tcg/riscv64/doubletrap.S
new file mode 100644
index 00000000000..b61089c9c1c
--- /dev/null
+++ b/tests/tcg/riscv64/doubletrap.S
@@ -0,0 +1,73 @@
+ .option norvc
+
+ .text
+ .global _start
+_start:
+ # Set up vectored interrupts
+ lla t0, trap
+ add t0, t0, 1
+ csrw mtvec, t0
+
+ # Enable sw interrupts
+ csrrsi zero, mie, 0x8
+ csrrsi zero, mstatus, 0x8
+
+ # Engage the double trap: we trigger an machine-level software
+ # interrupt, which will trap to an illegal instruction
+ lui t1, 0x02000
+ li t0, 1
+ sw t0, 0(t1)
+
+ # If we still not went out via the software interrupt route after a
+ # short while, we failed the test.
+ lui t0, 0x1
+0:
+ addi t0, t0, -1
+ bnez t0, 0b
+ j fail
+
+trap:
+ j illegal_insn # Exceptions
+ j fail # Supervisor software interrupt
+ j fail
+ .insn i CUSTOM_0, 0, x0, x0, 0 # Machine software interrupt
+ j fail
+ j fail # Supervisor timer interrupt
+ j fail
+ j fail # Machine timer interrupt
+ j fail
+ j fail # Supervisor external interrupt
+ j fail
+ j fail # Machine external interrupt
+ j fail
+ j fail # Counter overflow interrupt
+ j fail
+ j fail
+
+illegal_insn:
+ # Check whether we really got an illegal instruction
+ csrr t0, mcause
+ li t1, 2
+ bne t0, t1, fail
+ li a0, 0
+ j _exit
+fail:
+ li a0, 1
+_exit:
+ lla a1, semiargs
+ li t0, 0x20026 # ADP_Stopped_ApplicationExit
+ sd t0, 0(a1)
+ sd a0, 8(a1)
+ li a0, 0x20 # TARGET_SYS_EXIT_EXTENDED
+
+ # Semihosting call sequence
+ .balign 16
+ slli zero, zero, 0x1f
+ ebreak
+ srai zero, zero, 0x7
+ j .
+
+ .data
+ .balign 16
+semiargs:
+ .space 16
--
2.47.3
next prev parent reply other threads:[~2025-10-29 15:59 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-29 15:50 [PULL 00/35] maintainer updates (ci, plugins, semihosting) Alex Bennée
2025-10-29 15:50 ` [PULL 01/35] ci: clean-up remaining bits of armhf builds Alex Bennée
2025-10-29 15:50 ` [PULL 02/35] scripts/ci/setup: regenerate yaml Alex Bennée
2025-10-29 15:50 ` [PULL 03/35] scripts/ci: move build-environment.yaml up a level Alex Bennée
2025-10-29 15:50 ` [PULL 04/35] scripts/ci: allow both Ubuntu or Debian to run upgrade Alex Bennée
2025-10-29 15:50 ` [PULL 05/35] tests/lcitool: generate a yaml file for the ppc64le runner Alex Bennée
2025-10-29 15:50 ` [PULL 06/35] scripts/ci: modify gitlab runner deb setup Alex Bennée
2025-10-29 15:50 ` [PULL 07/35] plugins: add types for callbacks related to certain discontinuities Alex Bennée
2025-10-29 15:50 ` [PULL 08/35] plugins: add API for registering discontinuity callbacks Alex Bennée
2025-10-29 15:50 ` [PULL 09/35] plugins: add hooks for new discontinuity related callbacks Alex Bennée
2025-10-29 15:50 ` [PULL 10/35] contrib/plugins: add plugin showcasing new dicontinuity related API Alex Bennée
2025-10-29 15:50 ` [PULL 11/35] target/alpha: call plugin trap callbacks Alex Bennée
2025-10-29 15:50 ` [PULL 12/35] target/arm: " Alex Bennée
2025-10-29 15:50 ` [PULL 13/35] target/avr: " Alex Bennée
2025-10-29 15:50 ` [PULL 14/35] target/hppa: " Alex Bennée
2025-10-29 15:50 ` [PULL 15/35] target/i386: " Alex Bennée
2025-10-29 15:50 ` [PULL 16/35] target/loongarch: " Alex Bennée
2025-10-29 15:50 ` [PULL 17/35] target/m68k: " Alex Bennée
2025-10-29 15:50 ` [PULL 18/35] target/microblaze: " Alex Bennée
2025-10-29 15:50 ` [PULL 19/35] target/mips: " Alex Bennée
2025-10-29 15:50 ` [PULL 20/35] target/openrisc: " Alex Bennée
2025-10-29 15:50 ` [PULL 21/35] target/ppc: " Alex Bennée
2025-10-29 15:50 ` [PULL 22/35] target/riscv: " Alex Bennée
2025-10-29 15:50 ` [PULL 23/35] target/rx: " Alex Bennée
2025-10-29 15:50 ` [PULL 24/35] target/s390x: " Alex Bennée
2025-10-29 15:50 ` [PULL 25/35] target/sh4: " Alex Bennée
2025-10-29 15:50 ` [PULL 26/35] target/sparc: " Alex Bennée
2025-10-29 15:50 ` [PULL 27/35] target/tricore: " Alex Bennée
2025-10-29 15:50 ` [PULL 28/35] target/xtensa: " Alex Bennée
2025-10-29 15:50 ` [PULL 29/35] tests: add plugin asserting correctness of discon event's to_pc Alex Bennée
2025-10-29 15:50 ` Alex Bennée [this message]
2025-10-29 15:50 ` [PULL 31/35] tests: add test with interrupted memory accesses on rv64 Alex Bennée
2025-10-29 15:50 ` [PULL 32/35] plugins/core: add missing QEMU_DISABLE_CFI annotations Alex Bennée
2025-10-29 15:50 ` [PULL 33/35] configs: drop SBSA_REF from minimal specification Alex Bennée
2025-10-29 15:50 ` [PULL 34/35] gdbstub: Fix %s formatting Alex Bennée
2025-10-29 15:50 ` [PULL 35/35] semihosting: Fix GDB File-I/O FLEN Alex Bennée
2025-10-31 9:25 ` [PULL 00/35] maintainer updates (ci, plugins, semihosting) Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251029155045.257802-31-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=dbarboza@ventanamicro.com \
--cc=liwei1518@gmail.com \
--cc=neither@nut.email \
--cc=palmer@dabbelt.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=zhiwei_liu@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).