Fixups from #343 and #345 Co-authored-by: David Chisnall <github@theravensnest.org> Co-authored-by: Robert Norton <robert.norton@microsoft.com>
diff --git a/sdk/include/assembly-helpers.h b/sdk/include/assembly-helpers.h index 73b0a68..a747f09 100644 --- a/sdk/include/assembly-helpers.h +++ b/sdk/include/assembly-helpers.h
@@ -92,7 +92,7 @@ #else # define EXPORT_ASSEMBLY_NAME(name, value) # define EXPORT_ASSEMBLY_EXPRESSION(name, expression, value) -# define EXPORT_ASSEMBLY_OFFSET(structure, field, name) +# define EXPORT_ASSEMBLY_OFFSET(structure, field, value) # define EXPORT_ASSEMBLY_SIZE(structure, name, value) # define EXPORT_ASSEMBLY_OFFSET_NAMED(structure, field, value, name) #endif
diff --git a/sdk/lib/unwind_error_handler/unwind.S b/sdk/lib/unwind_error_handler/unwind.S index 6c74c06..8f179bb 100644 --- a/sdk/lib/unwind_error_handler/unwind.S +++ b/sdk/lib/unwind_error_handler/unwind.S
@@ -6,7 +6,7 @@ * * If there is no registered CleanupList structure (equivalently, there's no * CHERIOT_DURING block active at the time of the fault), then this requests - * unwnding out of the compartment. Otherwise, we will longjmp() out to the + * unwinding out of the compartment. Otherwise, we will longjmp() out to the * indicated handler (that is, the CHERIOT_HANDLER block associated with the * current CHERIOT_DURING block), having reset the compartment error handler * invocation counter to zero.
diff --git a/tests/crash_recovery-test.cc b/tests/crash_recovery-test.cc index 48dc278..cc67b24 100644 --- a/tests/crash_recovery-test.cc +++ b/tests/crash_recovery-test.cc
@@ -13,8 +13,9 @@ static void test_irqs_are_enabled() { void *r = __builtin_return_address(0); - TEST(__builtin_cheri_type_get(r) == CheriSealTypeReturnSentryEnabling, - "Calling context has IRQs disabled"); + TEST_EQUAL(__builtin_cheri_type_get(r), + CheriSealTypeReturnSentryEnabling, + "Calling context has IRQs disabled"); } extern "C" enum ErrorRecoveryBehaviour