refactor: fix cppcoreguidelines-macro-to-enum lint errors

cartesi · Oct 16, 2024 · ec40d60 · ec40d60
1 parent af7db70
commit ec40d60
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -15,7 +15,6 @@ Checks: >-
   -cppcoreguidelines-pro-bounds-pointer-arithmetic,
   -cppcoreguidelines-pro-type-vararg,
   -cppcoreguidelines-avoid-c-arrays,
-  -cppcoreguidelines-macro-to-enum,
   google*,
   -google-build-using-namespace,
   hicpp*,

diff --git a/src/htif-defines.h b/src/htif-defines.h
@@ -16,7 +16,7 @@
 
 #ifndef HTIF_DEFINES_H
 #define HTIF_DEFINES_H
-// NOLINTBEGIN(cppcoreguidelines-macro-usage,modernize-macro-to-enum)
+// NOLINTBEGIN(cppcoreguidelines-macro-usage,cppcoreguidelines-macro-to-enum,modernize-macro-to-enum)
 #define HTIF_DEV_SHIFT_DEF 56
 #define HTIF_CMD_SHIFT_DEF 48
 #define HTIF_REASON_SHIFT_DEF 32
@@ -49,6 +49,6 @@
 /* reply */
 #define HTIF_YIELD_REASON_ADVANCE_STATE_DEF 0
 #define HTIF_YIELD_REASON_INSPECT_STATE_DEF 1
-// NOLINTEND(cppcoreguidelines-macro-usage,modernize-macro-to-enum)
+// NOLINTEND(cppcoreguidelines-macro-usage,cppcoreguidelines-macro-to-enum,modernize-macro-to-enum)
 
 #endif /* end of include guard: HTIF_DEFINES_H */
diff --git a/src/pma-defines.h b/src/pma-defines.h
@@ -16,7 +16,7 @@
 
 #ifndef PMA_DEFINES_H
 #define PMA_DEFINES_H
-// NOLINTBEGIN(cppcoreguidelines-macro-usage,modernize-macro-to-enum)
+// NOLINTBEGIN(cppcoreguidelines-macro-usage,cppcoreguidelines-macro-to-enum,modernize-macro-to-enum)
 #define PMA_SHADOW_STATE_START_DEF 0x0            ///< Shadow start address
 #define PMA_SHADOW_STATE_LENGTH_DEF 0x1000        ///< Shadow length in bytes
 #define PMA_SHADOW_PMAS_START_DEF 0x10000         ///< PMA Array start address
@@ -70,5 +70,5 @@
 #ifndef EXPAND_UINT64_C
 #define EXPAND_UINT64_C(a) UINT64_C(a)
 #endif
-// NOLINTEND(cppcoreguidelines-macro-usage,modernize-macro-to-enum)
+// NOLINTEND(cppcoreguidelines-macro-usage,cppcoreguidelines-macro-to-enum,modernize-macro-to-enum)
 #endif /* end of include guard: PMA_DEFINES_H */
diff --git a/src/rtc-defines.h b/src/rtc-defines.h
@@ -16,7 +16,7 @@
 
 #ifndef RTC_DEFINES_H
 #define RTC_DEFINES_H
-// NOLINTBEGIN(cppcoreguidelines-macro-usage,modernize-macro-to-enum)
+// NOLINTBEGIN(cppcoreguidelines-macro-usage,cppcoreguidelines-macro-to-enum,modernize-macro-to-enum)
 
 /// \brief Number of cycles between RTC ticks
 /// Changing this value affects the machine state hash
@@ -27,5 +27,5 @@
 /// \brief Arbitrary CPU clock frequency.
 /// We have to make sure the clock frequency is divisible by RTC_FREQ_DIV_DEF and 10^6
 #define RTC_CLOCK_FREQ_DEF 128000000 ///< 128 MHz frequency
-// NOLINTEND(cppcoreguidelines-macro-usage,modernize-macro-to-enum)
+// NOLINTEND(cppcoreguidelines-macro-usage,cppcoreguidelines-macro-to-enum,modernize-macro-to-enum)
 #endif /* end of include guard: RTC_DEFINES_H */
diff --git a/src/uarch-defines.h b/src/uarch-defines.h
@@ -18,7 +18,7 @@
 #define UARCH_DEFINES_H
 
 #include "pma-defines.h"
-// NOLINTBEGIN(cppcoreguidelines-macro-usage,modernize-macro-to-enum)
+// NOLINTBEGIN(cppcoreguidelines-macro-usage,cppcoreguidelines-macro-to-enum,modernize-macro-to-enum)
 /// \brief Start address of the entire uarch memory range: shadow and ram
 #define UARCH_STATE_START_ADDRESS_DEF PMA_SHADOW_UARCH_STATE_START_DEF
 
@@ -29,5 +29,5 @@
 #define UARCH_ECALL_FN_HALT_DEF 1    // halt uarch
 #define UARCH_ECALL_FN_PUTCHAR_DEF 2 // putchar
 
-// NOLINTEND(cppcoreguidelines-macro-usage,modernize-macro-to-enum)
+// NOLINTEND(cppcoreguidelines-macro-usage,cppcoreguidelines-macro-to-enum,modernize-macro-to-enum)
 #endif /* end of include guard: UARCH_DEFINES_H */