Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HEWでコンパイルできない問題に対応 #152

Merged
merged 2 commits into from
Jan 4, 2022
Merged

HEWでコンパイルできない問題に対応 #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3819ebb
fix for hew
meltingrabbit Jan 3, 2022
6f572ea
fix define name
meltingrabbit Jan 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Examples/minimum_user_for_s2e/src/src_user/Settings/System/event_logger_params.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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_EL (16)
#define EL_CLOG_SIZE_MAX_EL (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
Expand Down
4 changes: 2 additions & 2 deletions ...mum_user_for_s2e/src/src_user/Test/test/src_core/System/EventManager/test_event_logger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 7 additions & 4 deletions System/EventManager/event_logger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@
// �㕔�Œ�`����Ă���C�e��table�T�C�Y
#include <src_user/Settings/System/event_logger_params.h>

#include "event_logger.h"

#define EL_LOG_MINIMUM_REQUIRED (2) //!< ���O�ɋ��߂���ŏ��v�f��
#define EL_LOG_MINIMUM_REQUIRED_EL_LOG (4) //!< EL���O�ɋ��߂���ŏ��v�f��

Expand Down Expand Up @@ -120,8 +118,13 @@
#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
// FIXME: event_logger.h �� event_handler.h ������ include �ɂȂ��Ă��܂��r���h�ł��Ȃ��̂ŁC�ꎞ�I�ɂ��̃A�T�[�V�����𖳌���
// #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
#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
Expand Down