Changeset 4cf93658 in rtems for bsps/i386/shared/cache/cache.c

Timestamp:

01/27/18 13:37:51 (5 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

05015dc1

Parents:

d8d6a08

git-author:

Sebastian Huber <sebastian.huber@…> (01/27/18 13:37:51)

git-committer:

Sebastian Huber <sebastian.huber@…> (01/31/18 11:49:09)

Message:

bsps: Rework cache manager implementation

The previous cache manager support used a single souce file
(cache_manager.c) which included an implementation header (cache_.h).
This required the use of specialized include paths to find the right
header file. Change this to include a generic implementation header
(cacheimpl.h) in specialized source files.

Use the following directories and files:

• bsps/shared/cache

• bsps/@RTEMS_CPU@/shared/cache

• bsps/@RTEMS_CPU@/@RTEMS_BSP_FAMILY/start/cache.c

Update #3285.

File:

• bsps/i386/shared/cache/cache.c (moved) (moved from c/src/lib/libcpu/i386/cache.c) (2 diffs)

bsps/i386/shared/cache/cache.c

@@ -4 +4 @@
 
 #include <rtems.h>
-#include "cache_.h"
 #include <rtems/score/cpu.h>
 #include <libcpu/page.h>
+
+#define I386_CACHE_ALIGNMENT 16
+#define CPU_DATA_CACHE_ALIGNMENT I386_CACHE_ALIGNMENT
+#define CPU_INSTRUCTION_CACHE_ALIGNEMNT I386_CACHE_ALIGNMENT
 
 void _CPU_disable_cache(void)
@@ -45 +48 @@
 
 #if defined(I386_CACHE_ALIGNMENT)
-void _CPU_cache_flush_1_data_line(const void *d_addr) {}
-void _CPU_cache_invalidate_1_data_line(const void *d_addr) {}
-void _CPU_cache_freeze_data(void) {}
-void _CPU_cache_unfreeze_data(void) {}
-void _CPU_cache_invalidate_1_instruction_line ( const void *d_addr ) {}
-void _CPU_cache_freeze_instruction(void) {}
-void _CPU_cache_unfreeze_instruction(void) {}
+static void _CPU_cache_flush_1_data_line(const void *d_addr) {}
+static void _CPU_cache_invalidate_1_data_line(const void *d_addr) {}
+static void _CPU_cache_freeze_data(void) {}
+static void _CPU_cache_unfreeze_data(void) {}
+static void _CPU_cache_invalidate_1_instruction_line ( const void *d_addr ) {}
+static void _CPU_cache_freeze_instruction(void) {}
+static void _CPU_cache_unfreeze_instruction(void) {}
 
-void _CPU_cache_flush_entire_data(void)
+static void _CPU_cache_flush_entire_data(void)
 {
   __asm__ volatile ("wbinvd");
 }
-void _CPU_cache_invalidate_entire_data(void)
+static void _CPU_cache_invalidate_entire_data(void)
 {
   __asm__ volatile ("invd");
 }
 
-void _CPU_cache_enable_data(void)
+static void _CPU_cache_enable_data(void)
 {
         _CPU_enable_cache();
 }
 
-void _CPU_cache_disable_data(void)
+static void _CPU_cache_disable_data(void)
 {
         _CPU_disable_cache();
 }
 
-void _CPU_cache_invalidate_entire_instruction(void)
+static void _CPU_cache_invalidate_entire_instruction(void)
 {
   __asm__ volatile ("invd");
 }
 
-void _CPU_cache_enable_instruction(void)
+static void _CPU_cache_enable_instruction(void)
 {
   _CPU_enable_cache();
 }
 
-void _CPU_cache_disable_instruction( void )
+static void _CPU_cache_disable_instruction( void )
 {
   _CPU_disable_cache();
 }
 #endif
+
+#include "../../../shared/cache/cacheimpl.h"