From 3819ebbba1821c40b8c2411e1e730534778d263c Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Mon, 3 Jan 2022 22:27:50 +0900 Subject: [PATCH 1/2] fix for hew --- .../src/src_user/Settings/System/event_logger_params.h | 4 ++-- System/EventManager/event_logger.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Examples/minimum_user_for_s2e/src/src_user/Settings/System/event_logger_params.h b/Examples/minimum_user_for_s2e/src/src_user/Settings/System/event_logger_params.h index 69306d09d..e2e7401cb 100644 --- a/Examples/minimum_user_for_s2e/src/src_user/Settings/System/event_logger_params.h +++ b/Examples/minimum_user_for_s2e/src/src_user/Settings/System/event_logger_params.h @@ -40,8 +40,8 @@ #define EL_TLOG_SIZE_MAX_EL (16) #define EL_CLOG_SIZE_MAX_EL (8) -#define EL_TLOG_SIZE_MAX_EL (16) -#define EL_CLOG_SIZE_MAX_EL (8) +#define EL_TLOG_SIZE_MAX_EH (16) +#define EL_CLOG_SIZE_MAX_EH (8) #define EL_IS_ENABLE_TLOG #define EL_IS_ENABLE_CLOG diff --git a/System/EventManager/event_logger.h b/System/EventManager/event_logger.h index 88ae5dd7a..c342a03fe 100644 --- a/System/EventManager/event_logger.h +++ b/System/EventManager/event_logger.h @@ -84,8 +84,6 @@ // 上部で定義されている，各種tableサイズ #include -#include "event_logger.h" - #define EL_LOG_MINIMUM_REQUIRED (2) //!< ログに求められる最小要素数 #define EL_LOG_MINIMUM_REQUIRED_EL_LOG (4) //!< ELログに求められる最小要素数 @@ -120,9 +118,11 @@ #undef EL_TLOG_LOG_SIZE_MAX_EL #endif // EL_IS_ENABLE_EL_ERROR_LEVEL -#if EL_TLOG_LOG_SIZE_MAX_EH <= EH_MAX_RULE_NUM_OF_EL_ID_DUPLICATES -#error EL_TLOG_LOG_SIZE_MAX_EH is too small -#endif +// FIXME: event_logger.h と event_handler.h が相互 include になってしまいビルドできないので，一時的にこのアサーションを無効化 +// #include "event_handler.h" +// #if EL_TLOG_LOG_SIZE_MAX_EH <= EH_MAX_RULE_NUM_OF_EL_ID_DUPLICATES +// #error EL_TLOG_LOG_SIZE_MAX_EH is too small +// #endif #else // EL_IS_ENABLE_TLOG From 6f572eacba9cc0a8de1c942bb638a1bef2fae355 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Tue, 4 Jan 2022 03:36:15 +0900 Subject: [PATCH 2/2] fix define name --- .../Settings/System/event_logger_params.h | 16 ++++++++-------- .../System/EventManager/test_event_logger.py | 4 ++-- System/EventManager/event_logger.h | 3 +++ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Examples/minimum_user_for_s2e/src/src_user/Settings/System/event_logger_params.h b/Examples/minimum_user_for_s2e/src/src_user/Settings/System/event_logger_params.h index e2e7401cb..104804422 100644 --- a/Examples/minimum_user_for_s2e/src/src_user/Settings/System/event_logger_params.h +++ b/Examples/minimum_user_for_s2e/src/src_user/Settings/System/event_logger_params.h @@ -15,10 +15,10 @@ #undef EL_CLOG_TLM_PAGE_MAX_MIDDLE #undef EL_CLOG_TLM_PAGE_MAX_LOW -#undef EL_TLOG_SIZE_MAX_EL -#undef EL_CLOG_SIZE_MAX_EL -#undef EL_TLOG_SIZE_MAX_EH -#undef EL_CLOG_SIZE_MAX_EH +#undef EL_TLOG_LOG_SIZE_MAX_EL +#undef EL_CLOG_LOG_SIZE_MAX_EL +#undef EL_TLOG_LOG_SIZE_MAX_EH +#undef EL_CLOG_LOG_SIZE_MAX_EH #undef EL_IS_ENABLE_TLOG #undef EL_IS_ENABLE_CLOG @@ -38,10 +38,10 @@ #define EL_CLOG_TLM_PAGE_MAX_MIDDLE (4) #define EL_CLOG_TLM_PAGE_MAX_LOW (4) -#define EL_TLOG_SIZE_MAX_EL (16) -#define EL_CLOG_SIZE_MAX_EL (8) -#define EL_TLOG_SIZE_MAX_EH (16) -#define EL_CLOG_SIZE_MAX_EH (8) +#define EL_TLOG_LOG_SIZE_MAX_EL (16) +#define EL_CLOG_LOG_SIZE_MAX_EL (8) +#define EL_TLOG_LOG_SIZE_MAX_EH (16) +#define EL_CLOG_LOG_SIZE_MAX_EH (8) #define EL_IS_ENABLE_TLOG #define EL_IS_ENABLE_CLOG diff --git a/Examples/minimum_user_for_s2e/src/src_user/Test/test/src_core/System/EventManager/test_event_logger.py b/Examples/minimum_user_for_s2e/src/src_user/Test/test/src_core/System/EventManager/test_event_logger.py index 3c6c3b6a2..9b9d9c614 100644 --- a/Examples/minimum_user_for_s2e/src/src_user/Test/test/src_core/System/EventManager/test_event_logger.py +++ b/Examples/minimum_user_for_s2e/src/src_user/Test/test/src_core/System/EventManager/test_event_logger.py @@ -27,8 +27,8 @@ EL_CLOG_TLM_PAGE_MAX_MIDDLE = 4 EL_CLOG_TLM_PAGE_MAX_LOW = 4 -EL_TLOG_SIZE_MAX_EL = 16 -EL_CLOG_SIZE_MAX_EL = 8 +EL_TLOG_LOG_SIZE_MAX_EL = 16 +EL_CLOG_LOG_SIZE_MAX_EL = 8 EL_ERROR_LEVEL_HIGH = 0 EL_ERROR_LEVEL_MIDDLE = 1 diff --git a/System/EventManager/event_logger.h b/System/EventManager/event_logger.h index c342a03fe..96827ec89 100644 --- a/System/EventManager/event_logger.h +++ b/System/EventManager/event_logger.h @@ -123,6 +123,9 @@ // #if EL_TLOG_LOG_SIZE_MAX_EH <= EH_MAX_RULE_NUM_OF_EL_ID_DUPLICATES // #error EL_TLOG_LOG_SIZE_MAX_EH is too small // #endif +#if EL_TLOG_LOG_SIZE_MAX_EH <= 0 +#error EL_TLOG_LOG_SIZE_MAX_EH must be a positive number +#endif #else // EL_IS_ENABLE_TLOG