Rename ram_pages to init_ram_pages.

This makes it conform to the Pintos convention that a global symbol name
begin with its module's name.

diff --git a/doc/reference.texi b/doc/reference.texi
index bfa076081eafaf74591d50f537d6be4b63b67e0e..d4426106687d068480ec37874fb4255293478197 100644 (file)
--- a/doc/reference.texi
+++ b/doc/reference.texi
@@ -133,7 +133,7 @@ initializer, that variable goes into the BSS.  Because it's all zeros, the
 BSS isn't stored in the image that the loader brought into memory.  We
 just use @func{memset} to zero it out.  The other task of
 @func{ram_init} is to read out the machine's memory size from where
-the loader stored it and put it into the @code{ram_pages} variable for
+the loader stored it and put it into the @code{init_ram_pages} variable for
 later use.
 
 Next, @func{main} calls @func{read_command_line} to break the kernel command

diff --git a/solutions/p3.patch b/solutions/p3.patch
index b0d0bf3c617bf19faa01164076eac1ddda1943a4..6bc703b5b1043ccbc309d66dcf8529b326f002d1 100644 (file)
--- a/solutions/p3.patch
+++ b/solutions/p3.patch
@@ -106,7 +106,7 @@ diff -u src/threads/init.c~ src/threads/init.c
 +#include "vm/swap.h"
  
  /* Amount of physical memory, in 4 kB pages. */
- size_t ram_pages;
+ size_t init_ram_pages;
 @@ -124,6 +126,9 @@ main (void)
    filesys_init (format_filesys);
  #endif
@@ -1443,7 +1443,7 @@ diff -u src/vm/frame.c~ src/vm/frame.c
 +
 +  lock_init (&scan_lock);
 +  
-+  frames = malloc (sizeof *frames * ram_pages);
++  frames = malloc (sizeof *frames * init_ram_pages);
 +  if (frames == NULL)
 +    PANIC ("out of memory allocating page frames");
 +

diff --git a/solutions/p4.patch b/solutions/p4.patch
index 7996c254601a9899294721238d475767d7daaf0d..d56d44e44ac0e3de4b8eb9aaa3fe53542d42d6a6 100644 (file)
--- a/solutions/p4.patch
+++ b/solutions/p4.patch
@@ -2052,7 +2052,7 @@ diff -u src/threads/init.c~ src/threads/init.c
 +#include "vm/swap.h"
  
  /* Amount of physical memory, in 4 kB pages. */
- size_t ram_pages;
+ size_t init_ram_pages;
 @@ -124,6 +126,9 @@ main (void)
    filesys_init (format_filesys);
  #endif
@@ -3491,7 +3491,7 @@ diff -u src/vm/frame.c~ src/vm/frame.c
 +
 +  lock_init (&scan_lock);
 +  
-+  frames = malloc (sizeof *frames * ram_pages);
++  frames = malloc (sizeof *frames * init_ram_pages);
 +  if (frames == NULL)
 +    PANIC ("out of memory allocating page frames");
 +

diff --git a/src/threads/init.c b/src/threads/init.c
index f804b863747ae42636878fe7ad9ec5e901a5fec4..d2d3e087de286cb8f5b48fd960d1568ae2d1cab4 100644 (file)
--- a/src/threads/init.c
+++ b/src/threads/init.c
@@ -38,7 +38,7 @@
 #endif
 
 /* Amount of physical memory, in 4 kB pages. */
-size_t ram_pages;
+size_t init_ram_pages;
 
 /* Page directory with kernel mappings only. */
 uint32_t *init_page_dir;
@@ -80,7 +80,8 @@ main (void)
   console_init ();  
 
   /* Greet user. */
-  printf ("Pintos booting with %'zu kB RAM...\n", ram_pages * PGSIZE / 1024);
+  printf ("Pintos booting with %'zu kB RAM...\n",
+          init_ram_pages * PGSIZE / 1024);
 
   /* Initialize memory system. */
   palloc_init (user_page_limit);
@@ -138,7 +139,7 @@ ram_init (void)
   memset (&_start_bss, 0, &_end_bss - &_start_bss);
 
   /* Get RAM size from loader.  See loader.S. */
-  ram_pages = *(uint32_t *) ptov (LOADER_RAM_PGS);
+  init_ram_pages = *(uint32_t *) ptov (LOADER_RAM_PGS);
 }
 
 /* Populates the base page directory and page table with the
@@ -159,7 +160,7 @@ paging_init (void)
 
   pd = init_page_dir = palloc_get_page (PAL_ASSERT | PAL_ZERO);
   pt = NULL;
-  for (page = 0; page < ram_pages; page++)
+  for (page = 0; page < init_ram_pages; page++)
     {
       uintptr_t paddr = page * PGSIZE;
       char *vaddr = ptov (paddr);

diff --git a/src/threads/init.h b/src/threads/init.h
index a5c7500ad9776e5a8257b6b97239c6dfa216f8ab..da6cc04c81dfbfeec3c5dd007029a4caa147fab7 100644 (file)
--- a/src/threads/init.h
+++ b/src/threads/init.h
@@ -7,7 +7,7 @@
 #include <stdint.h>
 
 /* Physical memory size, in 4 kB pages. */
-extern size_t ram_pages;
+extern size_t init_ram_pages;
 
 /* Page directory with kernel mappings only. */
 extern uint32_t *init_page_dir;

diff --git a/src/threads/palloc.c b/src/threads/palloc.c
index b2fcafea91ce5e6633a3ea2651e39d7376ad7977..177001f3c1c4b4ae622422be84f356217ac6dcf5 100644 (file)
--- a/src/threads/palloc.c
+++ b/src/threads/palloc.c
@@ -52,7 +52,7 @@ palloc_init (size_t user_page_limit)
 
   /* Free memory. */
   uint8_t *free_start = pg_round_up (&_end);
-  uint8_t *free_end = ptov (ram_pages * PGSIZE);
+  uint8_t *free_end = ptov (init_ram_pages * PGSIZE);
   size_t free_pages = (free_end - free_start) / PGSIZE;
   size_t user_pages = free_pages / 2;
   size_t kernel_pages;

diff --git a/src/userprog/pagedir.c b/src/userprog/pagedir.c
index 1442d4076067043f9ff35a516c999f2addff0cc3..a6a87b827ba16a12157d94df6f2a7233b7c59e8e 100644 (file)
--- a/src/userprog/pagedir.c
+++ b/src/userprog/pagedir.c
@@ -103,7 +103,7 @@ pagedir_set_page (uint32_t *pd, void *upage, void *kpage, bool writable)
   ASSERT (pg_ofs (upage) == 0);
   ASSERT (pg_ofs (kpage) == 0);
   ASSERT (is_user_vaddr (upage));
-  ASSERT (vtop (kpage) >> PTSHIFT < ram_pages);
+  ASSERT (vtop (kpage) >> PTSHIFT < init_ram_pages);
   ASSERT (pd != init_page_dir);
 
   pte = lookup_page (pd, upage, true);