Refactor equal processor headers into new generic ones

Refactor all processor headers which had the same content into a generic set, to reduce the number of duplicates. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
OpenAMP · Nov 10, 2023 · 85fb139 · 85fb139
1 parent dabb14f
commit 85fb139
Show file tree

Hide file tree

Showing 27 changed files with 57 additions and 204 deletions.
diff --git a/lib/atomic.h b/lib/atomic.h
@@ -107,7 +107,11 @@ using std::atomic_signal_fence;
 #elif defined(__GNUC__)
 # include <metal/compiler/gcc/atomic.h>
 #else
+#if defined(HAVE_PROCESSOR_ATOMIC_H)
 # include <metal/processor/@PROJECT_PROCESSOR@/atomic.h>
+#else
+# include <metal/processor/generic/atomic.h>
+#endif /* defined(HAVE_PROCESSOR_ATOMIC_H) */
 #endif
 
 #endif /* __METAL_ATOMIC__H__ */
diff --git a/lib/config.h b/lib/config.h
@@ -42,6 +42,8 @@ extern "C" {
 
 #cmakedefine HAVE_STDATOMIC_H
 #cmakedefine HAVE_FUTEX_H
+#cmakedefine HAVE_PROCESSOR_ATOMIC_H
+#cmakedefine HAVE_PROCESSOR_CPU_H
 
 #ifdef __cplusplus
 }

diff --git a/lib/cpu.h b/lib/cpu.h
@@ -12,6 +12,12 @@
 #ifndef __METAL_CPU__H__
 #define __METAL_CPU__H__
 
+#include <metal/config.h>
+
+#if defined(HAVE_PROCESSOR_CPU_H)
 # include <metal/processor/@PROJECT_PROCESSOR@/cpu.h>
+#else
+# include <metal/processor/generic/cpu.h>
+#endif
 
 #endif /* __METAL_CPU__H__ */
diff --git a/lib/processor/CMakeLists.txt b/lib/processor/CMakeLists.txt
@@ -1,2 +1,14 @@
-add_subdirectory (${PROJECT_PROCESSOR})
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_PROCESSOR}/cpu.h")
+	collect (PROJECT_LIB_HEADERS ${PROJECT_PROCESSOR}/cpu.h)
+	set(HAVE_PROCESSOR_CPU_H 1 CACHE INTERNAL "Have include ${PROJECT_PROCESSOR}/cpu.h")
+else()
+	collect (PROJECT_LIB_HEADERS generic/cpu.h)
+endif()
+
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_PROCESSOR}/atomic.h")
+	collect (PROJECT_LIB_HEADERS ${PROJECT_PROCESSOR}/atomic.h)
+	set(HAVE_PROCESSOR_ATOMIC_H 1 CACHE INTERNAL "Have include ${PROJECT_PROCESSOR}/atomic.h")
+else()
+	collect (PROJECT_LIB_HEADERS generic/atomic.h)
+endif()
 
diff --git a/lib/processor/aarch64/CMakeLists.txt b/lib/processor/aarch64/CMakeLists.txt
diff --git a/lib/processor/aarch64/atomic.h b/lib/processor/aarch64/atomic.h
diff --git a/lib/processor/arm/CMakeLists.txt b/lib/processor/arm/CMakeLists.txt
diff --git a/lib/processor/arm/atomic.h b/lib/processor/arm/atomic.h
diff --git a/lib/processor/arm/cpu.h b/lib/processor/arm/cpu.h
diff --git a/lib/processor/ceva/CMakeLists.txt b/lib/processor/ceva/CMakeLists.txt
diff --git a/lib/processor/csky/CMakeLists.txt b/lib/processor/csky/CMakeLists.txt
diff --git a/lib/processor/csky/cpu.h b/lib/processor/csky/cpu.h
diff --git a/lib/processor/generic/atomic.h b/lib/processor/generic/atomic.h
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/*
+ * @file	generic/atomic.h
+ * @brief	Generic environment atomic primitives for libmetal.
+ */
+
+#ifndef __METAL_GENERIC_ATOMIC__H__
+#define __METAL_GENERIC_ATOMIC__H__
+
+#endif /* __METAL_GENERIC_ATOMIC__H__ */
diff --git a/lib/processor/generic/cpu.h b/lib/processor/generic/cpu.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/*
+ * @file	generic/cpu.h
+ * @brief	Generic CPU specific primitives
+ */
+
+#ifndef __METAL_GENERIC_CPU__H__
+#define __METAL_GENERIC_CPU__H__
+
+#define metal_cpu_yield()
+
+#endif /* __METAL_GENERIC_CPU__H__ */
diff --git a/lib/processor/hosted/CMakeLists.txt b/lib/processor/hosted/CMakeLists.txt
diff --git a/lib/processor/hosted/atomic.h b/lib/processor/hosted/atomic.h
diff --git a/lib/processor/microblaze/CMakeLists.txt b/lib/processor/microblaze/CMakeLists.txt
diff --git a/lib/processor/microblaze/atomic.h b/lib/processor/microblaze/atomic.h
diff --git a/lib/processor/microblaze/cpu.h b/lib/processor/microblaze/cpu.h
diff --git a/lib/processor/riscv/CMakeLists.txt b/lib/processor/riscv/CMakeLists.txt
diff --git a/lib/processor/riscv/cpu.h b/lib/processor/riscv/cpu.h
diff --git a/lib/processor/x86/CMakeLists.txt b/lib/processor/x86/CMakeLists.txt
diff --git a/lib/processor/x86/atomic.h b/lib/processor/x86/atomic.h
diff --git a/lib/processor/x86_64/CMakeLists.txt b/lib/processor/x86_64/CMakeLists.txt
diff --git a/lib/processor/x86_64/atomic.h b/lib/processor/x86_64/atomic.h
diff --git a/lib/processor/xtensa/CMakeLists.txt b/lib/processor/xtensa/CMakeLists.txt
diff --git a/lib/processor/xtensa/atomic.h b/lib/processor/xtensa/atomic.h