From b580b4aa0b8988231f2552beb7275b635cff5895 Mon Sep 17 00:00:00 2001 From: Maschell Date: Sat, 26 Dec 2020 15:49:11 +0100 Subject: [PATCH] Rename WUMS_MODULE_INIT_BEFORE_ENTRYPOINT() to WUMS_MODULE_INIT_BEFORE_RELOCATION_DONE_HOOK(), add WUMS_MODULE_SKIP_ENTRYPOINT() - Bump module information version to 2 - Bump WUMS version to 0.1.1 --- Makefile | 2 +- include/wums/common.h | 3 ++- include/wums/defines/export_defines.h | 2 +- include/wums/defines/module_defines.h | 5 +++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 98921d3..6b23476 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/share/wums_rules export WUMS_MAJOR := 0 export WUMS_MINOR := 1 -export WUMS_PATCH := 0 +export WUMS_PATCH := 1 VERSION := $(WUMS_MAJOR).$(WUMS_MINOR).$(WUMS_PATCH) diff --git a/include/wums/common.h b/include/wums/common.h index a59c174..3cdba02 100644 --- a/include/wums/common.h +++ b/include/wums/common.h @@ -51,7 +51,8 @@ extern "C" { #define WUMS_MODULE_VERSION(x) WUMS_META(version, x) #define WUMS_MODULE_LICENSE(x) WUMS_META(license, x) #define WUMS_MODULE_DESCRIPTION(x) WUMS_META(description, x) -#define WUMS_MODULE_INIT_BEFORE_ENTRYPOINT() WUMS_META(initBeforeEntrypoint, "true") +#define WUMS_MODULE_SKIP_ENTRYPOINT() WUMS_META(skipEntrypoint, "true") +#define WUMS_MODULE_INIT_BEFORE_RELOCATION_DONE_HOOK() WUMS_META(initBeforeRelocationDoneHook, "true") #ifdef __cplusplus } diff --git a/include/wums/defines/export_defines.h b/include/wums/defines/export_defines.h index 6b007c7..bc66fdf 100644 --- a/include/wums/defines/export_defines.h +++ b/include/wums/defines/export_defines.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #define EXPORT_MAXIMUM_NAME_LENGTH 50 typedef struct export_data_t { diff --git a/include/wums/defines/module_defines.h b/include/wums/defines/module_defines.h index c9ef504..d8bc2e5 100644 --- a/include/wums/defines/module_defines.h +++ b/include/wums/defines/module_defines.h @@ -53,11 +53,12 @@ struct module_information_single_t { uint32_t entrypoint; uint32_t startAddress; uint32_t endAddress; - uint8_t initBeforeEntrypoint; + uint8_t skipEntrypoint; + uint8_t initBeforeRelocationDoneHook; }; #define MAXIMUM_MODULES 8 -#define MODULE_INFORMATION_VERSION 0x00000001 +#define MODULE_INFORMATION_VERSION 0x00000002 struct module_information_t { uint32_t version = MODULE_INFORMATION_VERSION;