2009-12-11 Joel Sherrill <joel.sherrill@oarcorp.com>

* page.c: Use bsp_mem_size.
This commit is contained in:
Joel Sherrill
2009-12-11 20:52:41 +00:00
parent f36eeb35df
commit fa62f19c1c
2 changed files with 7 additions and 11 deletions

View File

@@ -1,3 +1,7 @@
2009-12-11 Joel Sherrill <joel.sherrill@oarcorp.com>
* page.c: Use bsp_mem_size.
2009-10-28 Till Straumann <strauman@slac.stanford.edu> 2009-10-28 Till Straumann <strauman@slac.stanford.edu>
* displayCpu.c: Fixed formatting for prettier printing; * displayCpu.c: Fixed formatting for prettier printing;

View File

@@ -31,8 +31,7 @@ static int directoryEntry=0;
static int tableEntry=0; static int tableEntry=0;
static page_directory *pageDirectory; static page_directory *pageDirectory;
extern uint32_t rtemsFreeMemStart; extern uint32_t bsp_mem_size;
/*************************************************************************/ /*************************************************************************/
/************** IT IS A ONE-TO-ONE TRANSLATION ***************************/ /************** IT IS A ONE-TO-ONE TRANSLATION ***************************/
@@ -72,7 +71,6 @@ void _CPU_enable_paging(void)
int init_paging(void) int init_paging(void)
{ {
int memorySize;
int nbPages; int nbPages;
int nbInitPages; int nbInitPages;
char *Tables; char *Tables;
@@ -81,14 +79,8 @@ int init_paging(void)
unsigned int physPage; unsigned int physPage;
int nbTables=0; int nbTables=0;
/* nbPages = ( (bsp_mem_size - 1) / PG_SIZE ) + 1;
* rtemsFreeMemStart is the last valid 32-bits address nbTables = ( (bsp_mem_size - 1) / FOUR_MB ) + 2;
* so the size is rtemsFreeMemStart + 4
*/
memorySize = rtemsFreeMemStart + 4;
nbPages = ( (memorySize - 1) / PG_SIZE ) + 1;
nbTables = ( (memorySize - 1) / FOUR_MB ) + 2;
/* allocate 1 page more to page alignement */ /* allocate 1 page more to page alignement */
Tables = (char *)malloc( (nbTables + 1)*sizeof(page_table) ); Tables = (char *)malloc( (nbTables + 1)*sizeof(page_table) );