Changeset 361ec320 in rtems

Timestamp:

01/27/21 15:33:01 (16 months ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

master

Children:

426b6cd

Parents:

3272dcb

git-author:

Sebastian Huber <sebastian.huber@…> (01/27/21 15:33:01)

git-committer:

Sebastian Huber <sebastian.huber@…> (01/27/21 18:02:03)

Message:

cacheimpl.h: Avoid potential dead code

If CPU_DATA_CACHE_ALIGNMENT == CPU_INSTRUCTION_CACHE_ALIGNMENT we had
dead code with the previous implementation.

This fix relates to CID 1399776 (DEADCODE).

File:

• bsps/shared/cache/cacheimpl.h (modified) (2 diffs)

bsps/shared/cache/cacheimpl.h

@@ -83 +83 @@
 
 #include <rtems.h>
+
+#include <sys/param.h>
 
 #if defined(RTEMS_SMP) && defined(CPU_CACHE_NO_INSTRUCTION_CACHE_SNOOPING)
@@ -438 +440 @@
   return CPU_MAXIMAL_CACHE_ALIGNMENT;
 #endif
-  size_t max_line_size = 0;
-#if defined(CPU_DATA_CACHE_ALIGNMENT)
-  {
-    size_t data_line_size = CPU_DATA_CACHE_ALIGNMENT;
-    if ( max_line_size < data_line_size )
-      max_line_size = data_line_size;
-  }
-#endif
-#if defined(CPU_INSTRUCTION_CACHE_ALIGNMENT)
-  {
-    size_t instruction_line_size = CPU_INSTRUCTION_CACHE_ALIGNMENT;
-    if ( max_line_size < instruction_line_size )
-      max_line_size = instruction_line_size;
-  }
-#endif
-  return max_line_size;
+  size_t data_line_size =
+#if defined(CPU_DATA_CACHE_ALIGNMENT)
+    CPU_DATA_CACHE_ALIGNMENT;
+#else
+    0;
+#endif
+  size_t instruction_line_size =
+#if defined(CPU_INSTRUCTION_CACHE_ALIGNMENT)
+    CPU_INSTRUCTION_CACHE_ALIGNMENT;
+#else
+    0;
+#endif
+  return MAX( data_line_size, instruction_line_size );
 }