From efb28fec20ad1b22b4476a25b92ec1f5fb59a41f Mon Sep 17 00:00:00 2001 From: amrzar Date: Wed, 1 Feb 2017 16:29:24 +1100 Subject: [PATCH] Unify arch_shared_types.bf from the libsel --- .../arm/arch/32/mode/api/arch_shared_types.bf | 1 - .../arm/arch/32/mode/object/structures.bf | 2 +- include/arch/arm/arch/api/shared_types.bf | 1 + .../x86/arch/32/mode/api/arch_shared_types.bf | 1 - .../x86/arch/32/mode/object/structures.bf | 2 +- .../x86/arch/64/mode/api/arch_shared_types.bf | 1 - .../x86/arch/64/mode/object/structures.bf | 2 +- include/arch/x86/arch/api/shared_types.bf | 1 + libsel4/Makefile | 2 +- .../arm/sel4/arch/shared_types.bf} | 0 .../x86/sel4/arch/shared_types.bf} | 0 .../aarch32/sel4/sel4_arch/types.bf | 2 +- .../ia32/sel4/sel4_arch/shared_types_32.bf | 24 ------------------- .../ia32/sel4/sel4_arch/types.bf | 2 +- .../x86_64/sel4/sel4_arch/types.bf | 2 +- 15 files changed, 9 insertions(+), 34 deletions(-) delete mode 120000 include/arch/arm/arch/32/mode/api/arch_shared_types.bf create mode 120000 include/arch/arm/arch/api/shared_types.bf delete mode 120000 include/arch/x86/arch/32/mode/api/arch_shared_types.bf delete mode 120000 include/arch/x86/arch/64/mode/api/arch_shared_types.bf create mode 120000 include/arch/x86/arch/api/shared_types.bf rename libsel4/{sel4_arch_include/aarch32/sel4/sel4_arch/shared_types_32.bf => arch_include/arm/sel4/arch/shared_types.bf} (100%) rename libsel4/{sel4_arch_include/x86_64/sel4/sel4_arch/shared_types_64.bf => arch_include/x86/sel4/arch/shared_types.bf} (100%) delete mode 100644 libsel4/sel4_arch_include/ia32/sel4/sel4_arch/shared_types_32.bf diff --git a/include/arch/arm/arch/32/mode/api/arch_shared_types.bf b/include/arch/arm/arch/32/mode/api/arch_shared_types.bf deleted file mode 120000 index ba2865bfb..000000000 --- a/include/arch/arm/arch/32/mode/api/arch_shared_types.bf +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/shared_types_32.bf \ No newline at end of file diff --git a/include/arch/arm/arch/32/mode/object/structures.bf b/include/arch/arm/arch/32/mode/object/structures.bf index ceb3b3c4d..080309d0a 100644 --- a/include/arch/arm/arch/32/mode/object/structures.bf +++ b/include/arch/arm/arch/32/mode/object/structures.bf @@ -580,4 +580,4 @@ block dbg_wcr { } #endif /* CONFIG_HARDWARE_DEBUG_API */ -#include +#include diff --git a/include/arch/arm/arch/api/shared_types.bf b/include/arch/arm/arch/api/shared_types.bf new file mode 120000 index 000000000..533c9966a --- /dev/null +++ b/include/arch/arm/arch/api/shared_types.bf @@ -0,0 +1 @@ +../../../../../libsel4/arch_include/arm/sel4/arch/shared_types.bf \ No newline at end of file diff --git a/include/arch/x86/arch/32/mode/api/arch_shared_types.bf b/include/arch/x86/arch/32/mode/api/arch_shared_types.bf deleted file mode 120000 index c85af0078..000000000 --- a/include/arch/x86/arch/32/mode/api/arch_shared_types.bf +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../libsel4/sel4_arch_include/ia32/sel4/sel4_arch/shared_types_32.bf \ No newline at end of file diff --git a/include/arch/x86/arch/32/mode/object/structures.bf b/include/arch/x86/arch/32/mode/object/structures.bf index e9bc418c6..788c92f18 100644 --- a/include/arch/x86/arch/32/mode/object/structures.bf +++ b/include/arch/x86/arch/32/mode/object/structures.bf @@ -572,4 +572,4 @@ block cr3 { padding 12 } -#include +#include diff --git a/include/arch/x86/arch/64/mode/api/arch_shared_types.bf b/include/arch/x86/arch/64/mode/api/arch_shared_types.bf deleted file mode 120000 index 6ea1e2448..000000000 --- a/include/arch/x86/arch/64/mode/api/arch_shared_types.bf +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/shared_types_64.bf \ No newline at end of file diff --git a/include/arch/x86/arch/64/mode/object/structures.bf b/include/arch/x86/arch/64/mode/object/structures.bf index 302542ea0..095c69eb0 100644 --- a/include/arch/x86/arch/64/mode/object/structures.bf +++ b/include/arch/x86/arch/64/mode/object/structures.bf @@ -632,4 +632,4 @@ block cr3 { } -#include +#include diff --git a/include/arch/x86/arch/api/shared_types.bf b/include/arch/x86/arch/api/shared_types.bf new file mode 120000 index 000000000..eda923407 --- /dev/null +++ b/include/arch/x86/arch/api/shared_types.bf @@ -0,0 +1 @@ +../../../../../libsel4/arch_include/x86/sel4/arch/shared_types.bf \ No newline at end of file diff --git a/libsel4/Makefile b/libsel4/Makefile index 29a0cb124..44e8933e6 100644 --- a/libsel4/Makefile +++ b/libsel4/Makefile @@ -103,7 +103,7 @@ include/sel4/%.pbf: ${SOURCE_DIR}/include/sel4/%.bf $(srctree)/include/generated include/sel4/sel4_arch/%.pbf: ${SOURCE_DIR}/sel4_arch_include/${SEL4_ARCH}/sel4/sel4_arch/types.bf $(srctree)/include/generated/autoconf.h @echo " [PBF_GEN] $@" @mkdir -p $(dir $@) - $(Q)${CPP} ${CPPFLAGS} -P $< > $@ + $(Q)${CPP} ${CPPFLAGS} -I${SOURCE_DIR}/arch_include/${ARCH}/ -P $< > $@ # Bitfield generator include/sel4/types_gen.h: \ diff --git a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/shared_types_32.bf b/libsel4/arch_include/arm/sel4/arch/shared_types.bf similarity index 100% rename from libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/shared_types_32.bf rename to libsel4/arch_include/arm/sel4/arch/shared_types.bf diff --git a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/shared_types_64.bf b/libsel4/arch_include/x86/sel4/arch/shared_types.bf similarity index 100% rename from libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/shared_types_64.bf rename to libsel4/arch_include/x86/sel4/arch/shared_types.bf diff --git a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.bf b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.bf index cbdc5f3b7..59330fe78 100644 --- a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.bf +++ b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.bf @@ -101,4 +101,4 @@ block DebugException { } #endif -#include "shared_types_32.bf" +#include diff --git a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/shared_types_32.bf b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/shared_types_32.bf deleted file mode 100644 index 108bbab1e..000000000 --- a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/shared_types_32.bf +++ /dev/null @@ -1,24 +0,0 @@ --- --- Copyright 2016, Data61 --- Commonwealth Scientific and Industrial Research Organisation (CSIRO) --- ABN 41 687 119 230 --- --- This software may be distributed and modified according to the terms of --- the BSD 2-Clause license. Note that NO WARRANTY is provided. --- See "LICENSE_BSD2.txt" for details. --- --- @TAG(D61BSD) --- - -tagged_union seL4_Fault seL4_FaultType { - -- generic faults - tag NullFault 0 - tag CapFault 1 - tag UnknownSyscall 2 - tag UserException 3 -#ifdef CONFIG_HARDWARE_DEBUG_API - tag DebugException 4 -#endif - -- arch specific faults - tag VMFault 5 -} diff --git a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.bf b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.bf index 357e7fa09..8c5ed27f3 100644 --- a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.bf +++ b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.bf @@ -83,4 +83,4 @@ block DebugException { } #endif -#include "shared_types_32.bf" +#include diff --git a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/types.bf b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/types.bf index 876525537..59055b571 100644 --- a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/types.bf +++ b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/types.bf @@ -91,4 +91,4 @@ block DebugException { } #endif -#include "shared_types_64.bf" +#include