Fix aarch32 vm install

CONTRIBUTORS

@@ -17,3 +17,5 @@ Clay Chang <[email protected]>
 Manuel Rodríguez <[email protected]>
 Diogo Costa <[email protected]>
 Daniel Oliveira <[email protected]>
+joaopeixoto13 <[email protected]>
+Miguel Silva <[email protected]>

Makefile

@@ -57,7 +57,7 @@ non_build_targets+=ci clean
 build_targets:=$(strip $(foreach target, $(targets), \
 	$(if $(findstring $(target),$(non_build_targets)),,$(target))))
 
-#Plataform must be defined excpet for non-build-targets
+# Check platform target and set platform, driver and arch dirs based on it
 ifeq ($(PLATFORM),)
 ifneq ($(build_targets),)
  $(error Target platform argument (PLATFORM) not specified)
@@ -78,6 +78,23 @@ ifneq ($(MAKECMDGOALS), clean)
  core_mem_prot_dir:=$(core_dir)/$(arch_mem_prot)
 endif
 
+# Check configuration exists and set configurtion sources based on it
+config_dir:=$(CONFIG_REPO)
+config_src:=$(wildcard $(config_dir)/$(CONFIG).c)
+ifeq ($(config_src),)
+config_dir:=$(CONFIG_REPO)/$(CONFIG)
+config_src:=$(wildcard $(config_dir)/config.c)
+endif
+
+ifneq ($(build_targets),)
+ifeq ($(CONFIG),)
+$(error Configuration (CONFIG) not defined.)
+endif
+ifeq ($(config_src),)
+$(error Cant find file for $(CONFIG) config!)
+endif
+endif
+
 
 build_dir:=$(cur_dir)/build/$(PLATFORM)/$(CONFIG)
 bin_dir:=$(cur_dir)/bin/$(PLATFORM)/$(CONFIG)
@@ -87,19 +104,6 @@ src_dirs+=$(cpu_arch_dir) $(lib_dir) $(core_dir) $(core_mem_prot_dir) \
 	$(platform_dir) $(addprefix $(drivers_dir)/, $(drivers))
 inc_dirs:=$(addsuffix /inc, $(src_dirs))
 
-# Setup list of objects for compilation
--include $(addsuffix /objects.mk, $(src_dirs))
-
-objs-y:=
-objs-y+=$(addprefix $(cpu_arch_dir)/, $(cpu-objs-y))
-objs-y+=$(addprefix $(lib_dir)/, $(lib-objs-y))
-objs-y+=$(addprefix $(core_dir)/, $(core-objs-y))
-objs-y+=$(addprefix $(platform_dir)/, $(boards-objs-y))
-objs-y+=$(addprefix $(drivers_dir)/, $(drivers-objs-y))
-
-deps+=$(patsubst %.o,%.d,$(objs-y))
-objs-y:=$(patsubst $(src_dir)%, $(build_dir)%, $(objs-y))
-
 build_dirs:=$(patsubst $(src_dir)%, $(build_dir)%, $(src_dirs) $(inc_dirs))
 directories+=$(build_dirs)
 
@@ -123,14 +127,6 @@ deps+=$(asm_defs_hdr).d
 gens:=
 gens+=$(asm_defs_hdr)
 
-
-config_dir:=$(CONFIG_REPO)
-config_src:=$(wildcard $(config_dir)/$(CONFIG).c)
-ifeq ($(config_src),)
-config_dir:=$(CONFIG_REPO)/$(CONFIG)
-config_src:=$(wildcard $(config_dir)/config.c)
-endif
-
 config_build_dir:=$(build_dir)/config
 platform_build_dir:=$(build_dir)/platform
 scripts_build_dir:=$(build_dir)/scripts
@@ -151,15 +147,22 @@ platform_description:=$(platform_dir)/$(platform_description)
 gens+=$(platform_defs) $(platform_def_generator)
 inc_dirs+=$(platform_build_dir)
 
+# Setup list of objects for compilation
+-include $(addsuffix /objects.mk, $(src_dirs))
 
-ifneq ($(build_targets),)
-ifeq ($(CONFIG),)
-$(error Configuration (CONFIG) not defined.)
-endif
-ifeq ($(config_src),)
-$(error Cant find file for $(CONFIG) config!)
-endif
-endif
+objs-y:=
+objs-y+=$(addprefix $(cpu_arch_dir)/, $(cpu-objs-y))
+objs-y+=$(addprefix $(lib_dir)/, $(lib-objs-y))
+objs-y+=$(addprefix $(core_dir)/, $(core-objs-y))
+objs-y+=$(addprefix $(platform_dir)/, $(boards-objs-y))
+objs-y+=$(addprefix $(drivers_dir)/, $(drivers-objs-y))
+
+c_src_files:=$(wildcard $(patsubst %.o,%.c, $(objs-y)))
+asm_src_files:=$(wildcard $(patsubst %.o,%.S, $(objs-y)))
+c_hdr_files=$(shell cat $(deps) | grep -o "$(src_dir)/\S*\.h" | sort | uniq)
+
+deps+=$(patsubst %.o,%.d,$(objs-y))
+objs-y:=$(patsubst $(src_dir)%, $(build_dir)%, $(objs-y))
 
 config_obj:=$(config_src:$(config_dir)/%.c=$(config_build_dir)/%.o)
 config_dep:=$(config_src:$(config_dir)/%.c=$(config_build_dir)/%.d)
@@ -186,8 +189,22 @@ ifeq ($(DEBUG), y)
 	OPTIMIZATIONS:=g
 endif
 
-override CFLAGS+=-O$(OPTIMIZATIONS) -Wall -Werror -ffreestanding -std=gnu11 \
-	-fno-pic $(arch-cflags) $(platform-cflags) $(CPPFLAGS) $(debug_flags)
+cflags_warns:= \
+	-Warith-conversion -Wbuiltin-declaration-mismatch \
+	-Wcomments  -Wdiscarded-qualifiers \
+	-Wimplicit-fallthrough \
+	-Wswitch-unreachable -Wreturn-local-addr  \
+	-Wshift-count-negative  -Wuninitialized \
+	-Wunused -Wunused-local-typedefs  -Wunused-parameter \
+	-Wunused-result -Wvla \
+	-Wconversion -Wsign-conversion \
+	-Wmissing-prototypes -Wmissing-declarations  \
+	-Wswitch-default -Wshadow -Wshadow=global \
+	-Wcast-qual -Wunused-macros
+
+override CFLAGS+=-O$(OPTIMIZATIONS) -Wall -Werror -Wextra $(cflags_warns) \
+	-ffreestanding -std=c11 -pedantic -pedantic-errors -fno-pic \
+	$(arch-cflags) $(platform-cflags) $(CPPFLAGS) $(debug_flags)
 
 override ASFLAGS+=$(CFLAGS) $(arch-asflags) $(platform-asflags)
 
@@ -294,6 +311,12 @@ $(directories):
 
 endif
 
+# Count lines of code for the exact target platform and configuration
+
+.PHONY: cloc
+cloc: | $(deps)
+	@cloc --by-file-by-lang  $(c_src_files) $(asm_src_files) $(c_hdr_files)
+
 #Clean all object, dependency and generated files
 
 .PHONY: clean
@@ -310,12 +333,12 @@ all_files= $(realpath \
 	$(call list_dir_files_recursive, $(scripts_dir), *) \
 	$(call list_dir_files_recursive, $(config_dir)/example, *) \
 )
-c_src_files=$(realpath $(call list_dir_files_recursive, src, *.c))
-c_hdr_files=$(realpath $(call list_dir_files_recursive, src, *.h))
-c_files=$(c_src_files) $(c_hdr_files)
+all_c_src_files=$(realpath $(call list_dir_files_recursive, src, *.c))
+all_c_hdr_files=$(realpath $(call list_dir_files_recursive, src, *.h))
+all_c_files=$(all_c_src_files) $(all_c_hdr_files)
 
 $(call ci, license, "Apache-2.0", $(all_files))
-$(call ci, format, $(c_files))
+$(call ci, format, $(all_c_files))
 
 .PHONY: ci
 ci: license-check format-check

configs/null/config.c

@@ -20,4 +20,6 @@ struct config config = {
          */
         .vmlist_size = 1,
 
+        .vmlist = (struct vm_config[]){ {.entry = 0 } },
+
 };

src/arch/armv8/aarch32/aborts.c

@@ -3,7 +3,7 @@
  * Copyright (c) Bao Project and Contributors. All rights reserved.
  */
 
-#include <bao.h>
+#include <arch/aborts.h>
 #include <arch/sysregs.h>
 #include <cpu.h>
 

src/arch/armv8/aarch32/exceptions.S

@@ -6,8 +6,6 @@
 #include <asm_defs.h>
 #include <arch/sysregs.h>
 
-#define ENTRY_SIZE   (0x4)
-
 .text 
 
 .macro SAVE_HYP_GPRS

src/arch/armv8/aarch32/inc/arch/spinlock.h

@@ -13,7 +13,7 @@ typedef struct {
     uint32_t next;
 } spinlock_t;
 
-#define SPINLOCK_INITVAL ((spinlock_t){ 0, 0 })
+static const spinlock_t SPINLOCK_INITVAL = { 0, 0 };
 
 static inline void spinlock_init(spinlock_t* lock)
 {