commit 8435071ec72afb6e5ccbbf2f28d14ee2b0f3ce81
author Daniel Boulby <daniel.boulby@arm.com> Fri Nov 26 11:13:20 2021 +0000
committer Joao Alves <joao.alves@arm.com> Mon Dec 06 12:36:46 2021 +0100
tree 5c866a4da1f2edbfde8e7be2d3a53c075c2bb4d2
parent 6530adf5735185ea65749c8ec5b2b0a93866e908

build(ffa): change invariant CHECK to assert (1/3)

Signed-off-by: Daniel Boulby <daniel.boulby@arm.com>
Change-Id: I519e327b4a488ea02320a94ad973c7943534e9fd

inc/hf/addr.h

diff --git a/inc/hf/addr.h b/inc/hf/addr.h
index a2d2080..45d7b37 100644
--- a/inc/hf/addr.h
+++ b/inc/hf/addr.h
@@ -13,7 +13,7 @@
 
 #include "hf/arch/types.h"
 
-#include "hf/check.h"
+#include "hf/assert.h"
 
 /** An opaque type for a physical address. */
 typedef struct {
@@ -83,7 +83,7 @@
  */
 static inline paddr_t pa_sub(paddr_t pa, size_t n)
 {
-	CHECK((uintptr_t)pa_addr(pa) >= n);
+	assert((uintptr_t)pa_addr(pa) >= n);
 	return pa_init(pa_addr(pa) - n);
 }
 

src/arch/aarch64/hypervisor/cpu.c

diff --git a/src/arch/aarch64/hypervisor/cpu.c b/src/arch/aarch64/hypervisor/cpu.c
index 1ae0796..0872b8f 100644
--- a/src/arch/aarch64/hypervisor/cpu.c
+++ b/src/arch/aarch64/hypervisor/cpu.c
@@ -15,6 +15,7 @@
 #include "hf/arch/plat/psci.h"
 
 #include "hf/addr.h"
+#include "hf/check.h"
 #include "hf/ffa.h"
 #include "hf/plat/interrupts.h"
 #include "hf/std.h"

src/arch/aarch64/mm.c

diff --git a/src/arch/aarch64/mm.c b/src/arch/aarch64/mm.c
index 7256c28..ecb068d 100644
--- a/src/arch/aarch64/mm.c
+++ b/src/arch/aarch64/mm.c
@@ -12,6 +12,7 @@
 #include "hf/arch/cpu.h"
 #include "hf/arch/mmu.h"
 
+#include "hf/check.h"
 #include "hf/dlog.h"
 
 #include "msr.h"

src/vm_test.cc

diff --git a/src/vm_test.cc b/src/vm_test.cc
index 1ee0963..e0fc89e 100644
--- a/src/vm_test.cc
+++ b/src/vm_test.cc
@@ -9,6 +9,7 @@
 #include <gmock/gmock.h>
 
 extern "C" {
+#include "hf/check.h"
 #include "hf/mpool.h"
 #include "hf/vm.h"
 }