RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2010-05-21 Vinu Rajashekhar <vinutheraj@gmail.com>

Browse Source 
* cache.c, page.c: Use masks and shift operations instead of
	bit-fields.
This commit is contained in:
Joel Sherrill
2010-05-21 19:03:21 +00:00
parent 4a76be7ef5
commit 665285f217
3 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libcpu/i386/ChangeLog
View File

@@ -1,3 +1,8 @@
2010-05-21 Vinu Rajashekhar <vinutheraj@gmail.com>
* cache.c, page.c: Use masks and shift operations instead of
bit-fields.
2010-04-15 Joel Sherrill <joel.sherrill@oarcorp.com> 2010-04-15 Joel Sherrill <joel.sherrill@oarcorp.com>
* cpuModel.S, cpuModel.h, displayCpu.c: Update to include more reserved * cpuModel.S, cpuModel.h, displayCpu.c: Update to include more reserved

20
c/src/lib/libcpu/i386/cache.c
View File

@@ -9,12 +9,12 @@
#include "cache_.h" #include "cache_.h"
void _CPU_disable_cache(void) { void _CPU_disable_cache(void) {
cr0 regCr0; unsigned int regCr0;
regCr0.i = i386_get_cr0(); regCr0 = i386_get_cr0();
regCr0.cr0.page_level_cache_disable = 1; regCr0 |= CR0_PAGE_LEVEL_CACHE_DISABLE;
regCr0.cr0.no_write_through = 1; regCr0 |= CR0_NO_WRITE_THROUGH;
i386_set_cr0( regCr0.i ); i386_set_cr0( regCr0 );
rtems_cache_flush_entire_data(); rtems_cache_flush_entire_data();
} }
@@ -23,12 +23,12 @@ void _CPU_disable_cache(void) {
*/ */
void _CPU_enable_cache(void) { void _CPU_enable_cache(void) {
cr0 regCr0; unsigned int regCr0;
regCr0.i = i386_get_cr0(); regCr0 = i386_get_cr0();
regCr0.cr0.page_level_cache_disable = 0; regCr0 &= ~(CR0_PAGE_LEVEL_CACHE_DISABLE);
regCr0.cr0.no_write_through = 0; regCr0 &= ~(CR0_NO_WRITE_THROUGH);
i386_set_cr0( regCr0.i ); i386_set_cr0( regCr0 );
/*rtems_cache_flush_entire_data();*/ /*rtems_cache_flush_entire_data();*/
} }

49
c/src/lib/libcpu/i386/page.c
View File

@@ -43,12 +43,12 @@ extern uint32_t bsp_mem_size;
*/ */
void _CPU_disable_paging(void) void _CPU_disable_paging(void)
{ {
cr0 regCr0; unsigned int regCr0;
rtems_cache_flush_entire_data(); rtems_cache_flush_entire_data();
regCr0.i = i386_get_cr0(); regCr0 = i386_get_cr0();
regCr0.cr0.paging = 0; regCr0 &= ~(CR0_PAGING);
i386_set_cr0( regCr0.i ); i386_set_cr0( regCr0 );
} }
/* /*
@@ -56,11 +56,11 @@ void _CPU_disable_paging(void)
*/ */
void _CPU_enable_paging(void) void _CPU_enable_paging(void)
{ {
cr0 regCr0; unsigned int regCr0;
regCr0.i = i386_get_cr0(); regCr0 = i386_get_cr0();
regCr0.cr0.paging = 1; regCr0 |= CR0_PAGING;
i386_set_cr0( regCr0.i ); i386_set_cr0( regCr0 );
rtems_cache_flush_entire_data(); rtems_cache_flush_entire_data();
} }
@@ -74,7 +74,7 @@ int init_paging(void)
int nbPages; int nbPages;
int nbInitPages; int nbInitPages;
char *Tables; char *Tables;
cr3 regCr3; unsigned int regCr3;
page_table *pageTable; page_table *pageTable;
unsigned int physPage; unsigned int physPage;
int nbTables=0; int nbTables=0;
@@ -135,11 +135,12 @@ int init_paging(void)
nbInitPages++; nbInitPages++;
} }
regCr3.cr3.page_write_transparent = 0; regCr3 &= ~(CR3_PAGE_WRITE_THROUGH);
regCr3.cr3.page_cache_disable = 0; regCr3 &= ~(CR3_PAGE_CACHE_DISABLE);
regCr3.cr3.page_directory_base = (unsigned int)pageDirectory >> 12; /*regCr3.cr3.page_directory_base = (unsigned int)pageDirectory >> 12;*/
regCr3 = (unsigned int)pageDirectory & CR3_PAGE_DIRECTORY_MASK;
i386_set_cr3( regCr3.i ); i386_set_cr3( regCr3 );
_CPU_enable_cache(); _CPU_enable_cache();
_CPU_enable_paging(); _CPU_enable_paging();
@@ -152,10 +153,10 @@ int init_paging(void)
*/ */
int _CPU_is_cache_enabled(void) int _CPU_is_cache_enabled(void)
{ {
cr0 regCr0; unsigned int regCr0;
regCr0.i = i386_get_cr0(); regCr0 = i386_get_cr0();
return( ~(regCr0.cr0.page_level_cache_disable) ); return( ~(regCr0 & CR0_PAGE_LEVEL_CACHE_DISABLE) );
} }
/* /*
@@ -163,10 +164,10 @@ int _CPU_is_cache_enabled(void)
*/ */
int _CPU_is_paging_enabled(void) int _CPU_is_paging_enabled(void)
{ {
cr0 regCr0; unsigned int regCr0;
regCr0.i = i386_get_cr0(); regCr0 = i386_get_cr0();
return(regCr0.cr0.paging); return(regCr0 & CR0_PAGING);
} }
@@ -454,21 +455,21 @@ int _CPU_change_memory_mapping_attribute(
int _CPU_display_memory_attribute(void) int _CPU_display_memory_attribute(void)
{ {
unsigned int dirCount, pageCount; unsigned int dirCount, pageCount;
cr0 regCr0; unsigned int regCr0;
page_table *localPageTable; page_table *localPageTable;
unsigned int prevCache; unsigned int prevCache;
unsigned int prevPresent; unsigned int prevPresent;
unsigned int maxPage; unsigned int maxPage;
unsigned char pagingWasEnabled; unsigned char pagingWasEnabled;
regCr0.i = i386_get_cr0(); regCr0 = i386_get_cr0();
printk("\n\n********* MEMORY CACHE CONFIGURATION *****\n"); printk("\n\n********* MEMORY CACHE CONFIGURATION *****\n");
printk("CR0 -> paging : %s\n",(regCr0.cr0.paging ? "ENABLE ":"DISABLE")); printk("CR0 -> paging : %s\n",((regCr0 & CR0_PAGING) ? "ENABLE ":"DISABLE"));
printk(" page-level cache : %s\n\n",(regCr0.cr0.page_level_cache_disable ? "DISABLE":"ENABLE")); printk(" page-level cache : %s\n\n",((regCr0 & CR0_PAGE_LEVEL_CACHE_DISABLE) ? "DISABLE":"ENABLE"));
if (regCr0.cr0.paging == 0) if ((regCr0 & CR0_PAGING) == 0)
return 0; return 0;
prevPresent = 0; prevPresent = 0;