Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/rp2_common/cmsis/include/cmsis/rename_exceptions.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#endif

#if PICO_CMSIS_RENAME_EXCEPTIONS
#if PICO_RP2040
#if __ARM_ARCH_6M__
#define isr_nmi NMI_Handler
#define isr_hardfault HardFault_Handler
#define isr_svcall SVC_Handler
Expand Down Expand Up @@ -48,8 +48,7 @@
#define isr_irq23 I2C0_IRQ_Handler
#define isr_irq24 I2C1_IRQ_Handler
#define isr_irq25 RTC_IRQ_Handler
#endif
#if PICO_RP2350
#elif __ARM_ARCH_8M_MAIN__
#define isr_nmi NMI_Handler
#define isr_hardfault HardFault_Handler
#define isr_memmanage MemManage_Handler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ int main() {
}
}
if (failed == 0u) {
printf("All tests passed.\n");
printf("PASSED\n");
return 0;
} else {
printf("%u tests failed. Review log for details.\n", failed);
Expand Down
12 changes: 11 additions & 1 deletion test/kitchen_sink/kitchen_sink.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@

#include <stdio.h>
#include <string.h>
#include <stdlib.h>

#ifndef KITCHEN_SINK_INCLUDE_HEADER
// provided for backwards compatibility for non CMake build systems - just includes enough to compile
#include "hardware/dma.h"
#include "hardware/exception.h"
#include "pico/sync.h"
#include "pico/stdlib.h"
#if LIB_PICO_BINARY_INFO
Expand Down Expand Up @@ -61,6 +63,11 @@ float __attribute__((noinline)) foox(float x, float b) {
return x * b;
}

void svc_call(void) {
puts("PASSED");
exit(0);
}

int main(void) {
spiggle();

Expand Down Expand Up @@ -125,7 +132,10 @@ int main(void) {
#endif
#endif
#ifndef __riscv
// this should compile as we are Cortex M0+
exception_set_exclusive_handler(SVCALL_EXCEPTION, svc_call);
// this should compile as we are Cortex-M
pico_default_asm ("SVC #3");
#else
puts("PASSED");
#endif
}
2 changes: 1 addition & 1 deletion test/pico_divider_test/pico_divider_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ int main() {

test_random();

ostr("END\n");
ostr("PASSED\n");
return 0;
#endif
}
Expand Down
2 changes: 1 addition & 1 deletion test/pico_sha256_test/pico_sha256_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -172,5 +172,5 @@ int main() {
run_test(false);
run_test(true);

printf("Test passed\n");
printf("PASSED\n");
}
2 changes: 1 addition & 1 deletion test/pico_stdlib_test/pico_stdlib_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,5 +101,5 @@ int main() {
printf("%" PRIu64 "\n", to_us_since_boot(get_absolute_time()));
until = delayed_by_us(until, 500000);
}
puts("DONE");
puts("PASSED");
}
2 changes: 1 addition & 1 deletion test/pico_test/include/pico/test.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ but not sure that is implemented yet.
#define PICOTEST_END_TEST() if (picotest_error_code != 0) \
{printf("%s: Failed\n", picotest_description); return -1;} \
else \
{printf("%s: Success\n", picotest_description); return 0;}
{printf("%s: Success\n", picotest_description); puts("PASSED"); return 0;}


#endif
Loading