Merge branch 'master' of https://github.com/cahirwpz/mimiker into vcache

Author: mohrcore

.ackrc

@@ -1,6 +1,7 @@
---ignore-dir=toolchain/mipsel-mimiker-elf
+--ignore-dir=toolchain/gnu/aarch64-mimiker-elf
+--ignore-dir=toolchain/gnu/mipsel-mimiker-elf
+--ignore-dir=toolchain/gnu/riscv32-mimiker-elf
 --ignore-dir=toolchain/qemu-mimiker
---ignore-dir=lib/newlib
 --ignore-dir=sysroot
 --asm
 --cc

bin/utest/mmap.c

@@ -12,12 +12,10 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#ifdef __mips__
+#if __SIZEOF_POINTER__ == 4
 #define BAD_ADDR_SPAN 0x7fff0000
 #define BAD_ADDR_SPAN_LEN 0x20000
-#endif
-
-#ifdef __aarch64__
+#else
 #define BAD_ADDR_SPAN 0x00007fffffff0000L
 #define BAD_ADDR_SPAN_LEN 0xfffe800000002000
 #endif

bin/utest/sbrk.c

@@ -5,11 +5,9 @@
 #include <unistd.h>
 #include <assert.h>
 
-#ifdef __mips__
+#if __SIZEOF_POINTER__ == 4
 #define TOO_MUCH 0x80000000
-#endif
-
-#ifdef __aarch64__
+#else
 #define TOO_MUCH 0x4000000000000000L
 #endif
 

build/arch.riscv.mk

@@ -0,0 +1,27 @@
+# vim: tabstop=8 shiftwidth=8 noexpandtab:
+#
+# Common makefile which specifies RISC-V architecture specific settings.
+#
+# Explanation of specified options can be found here:
+#   https://gcc.gnu.org/onlinedocs/gcc/RISC-V-Options.html#RISC-V-Options
+#
+# Required common variables: KERNEL, BOARD.
+#
+
+TARGET := riscv32-mimiker-elf
+GCC_ABIFLAGS := 
+CLANG_ABIFLAGS := -target riscv32-elf
+ELFTYPE := elf32-littleriscv
+ELFARCH := riscv
+
+ifeq ($(BOARD), litex-riscv)
+	KERNEL_PHYS := 0x40000000
+	KERNEL-IMAGES := mimiker.img
+	CPPFLAGS += -DFPU=1
+endif
+
+ifeq ($(KERNEL), 1)
+	CFLAGS += -mcmodel=medany
+	CPPFLAGS += -DKERNEL_PHYS=$(KERNEL_PHYS)
+	CPPLDSCRIPT := 1
+endif

config.mk

@@ -4,12 +4,13 @@
 # build system for given platform.
 #
 
-CONFIG_OPTS := KASAN LOCKDEP KGPROF MIPS AARCH64 KCSAN
+CONFIG_OPTS := KASAN LOCKDEP KGPROF MIPS AARCH64 RISCV KCSAN
 
 BOARD ?= malta
 
 MIPS ?= 0
 AARCH64 ?= 0
+RISCV ?= 0
 
 ifeq ($(BOARD), malta)
 ARCH := mips
@@ -21,6 +22,11 @@ ARCH := aarch64
 AARCH64 := 1
 endif
 
+ifeq ($(BOARD), litex-riscv)
+ARCH := riscv
+RISCV := 1
+endif
+
 VERBOSE ?= 0
 CLANG ?= 0
 LOCKDEP ?= 0

include/Makefile

@@ -5,7 +5,7 @@ TOPDIR = $(realpath ..)
 HEADERS = $(wildcard *.h) $(foreach dir, machine sys, $(wildcard $(dir)/*.h))
 INSTALL-FILES = $(addprefix $(SYSROOT)/usr/include/, $(HEADERS))
 
-SOURCES_H = $(foreach dir, . dev aarch64 mips sys, $(wildcard $(dir)/*.h))
+SOURCES_H = $(foreach dir, . dev aarch64 mips riscv sys, $(wildcard $(dir)/*.h))
 FORMAT-EXCLUDE = mips/m32c0.h sys/syscall.h sys/syscallargs.h
 
 all: build

include/aarch64/asm.h

@@ -32,8 +32,6 @@
 #ifndef _AARCH64_ASM_H_
 #define _AARCH64_ASM_H_
 
-#include <aarch64/cdefs.h>
-
 #define _C_LABEL(x) x
 
 #define EXPORT(x)                                                              \

include/aarch64/cdefs.h

@@ -61,7 +61,6 @@
 #include <machine/abi.h>
 #include <machine/regdef.h>
 #include <sys/endian.h>
-#include <machine/cdefs.h>
 
 #define _C_LABEL(x) x