mirror of
https://github.com/tinygo-org/tinygo.git
synced 2026-08-10 14:03:39 +00:00
qemu: signal correct exit code to QEMU
There were a few issues that were causing qemu-system-arm and
qemu-system-riscv to give the wrong exit codes. They are in fact capable
of exiting with 0 or 1 signalled from the running application, but this
functionality wasn't used. This commit changes this in the following
ways:
* It fixes SemiHosting codes, which were incorrectly written in
decimal while they should have been written in hexadecimal (oops!).
* It modifies all the baremetal main functions (aka reset handlers) to
exit with `exit(0)` instead of `abort()`.
* It changes `syscall.Exit` to call `exit(code)` instead of `abort()`
on baremetal targets.
* It adds these new exit functions where necessary, implemented in a
way that signals the correct exit status if running under QEMU.
All in all, this means that `tinygo test` doesn't have to look at the
output of a test to determine the outcome. It can simply look at the
exit code.
This commit is contained in:
committed by
Ron Evans
parent
00c73d62ad
commit
98f84a497d
@@ -21,7 +21,7 @@ func postinit() {}
|
||||
func main() {
|
||||
preinit()
|
||||
run()
|
||||
abort()
|
||||
exit(0)
|
||||
}
|
||||
|
||||
func ticksToNanoseconds(ticks timeUnit) int64 {
|
||||
@@ -49,7 +49,7 @@ var (
|
||||
// UART0 output register.
|
||||
stdoutWrite = (*volatile.Register8)(unsafe.Pointer(uintptr(0x10000000)))
|
||||
// SiFive test finisher
|
||||
testFinisher = (*volatile.Register16)(unsafe.Pointer(uintptr(0x100000)))
|
||||
testFinisher = (*volatile.Register32)(unsafe.Pointer(uintptr(0x100000)))
|
||||
)
|
||||
|
||||
func putchar(c byte) {
|
||||
@@ -57,8 +57,17 @@ func putchar(c byte) {
|
||||
}
|
||||
|
||||
func abort() {
|
||||
exit(1)
|
||||
}
|
||||
|
||||
func exit(code int) {
|
||||
// Make sure the QEMU process exits.
|
||||
testFinisher.Set(0x5555) // FINISHER_PASS
|
||||
if code == 0 {
|
||||
testFinisher.Set(0x5555) // FINISHER_PASS
|
||||
} else {
|
||||
// Exit code is stored in the upper 16 bits of the 32 bit value.
|
||||
testFinisher.Set(uint32(code)<<16 | 0x3333) // FINISHER_FAIL
|
||||
}
|
||||
|
||||
// Lock up forever (as a fallback).
|
||||
for {
|
||||
|
||||
Reference in New Issue
Block a user