Changeset 51029384 in mainline

Timestamp:

2005-07-20T13:56:18Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b5eb1ee

Parents:

121dab5

Message:

Fix setters of page table attributes for both IA-32 and MIPS.

Files:

• arch/ia32/include/mm/page.h (modified) (1 diff)
• arch/mips/include/mm/page.h (modified) (1 diff)
• src/Makefile.config (modified) (1 diff)
• src/main/kinit.c (modified) (1 diff)

arch/ia32/include/mm/page.h

@@ -106 +106 @@
         p->page_cache_disable = !(flags & PAGE_CACHEABLE);
         p->present = !(flags & PAGE_NOT_PRESENT);
-        p->uaccessible = flags & PAGE_USER;
-        p->writeable = flags & PAGE_WRITE;
+        p->uaccessible = (flags & PAGE_USER) != 0;
+        p->writeable = (flags & PAGE_WRITE) != 0;
 }
 

arch/mips/include/mm/page.h

@@ -102 +102 @@
         pte_t *p = &pt[i];
         
-        p->c = (flags & PAGE_CACHEABLE) ? PAGE_CACHEABLE_EXC_WRITE : PAGE_UNCACHED;
+        p->c = (flags & PAGE_CACHEABLE) != 0 ? PAGE_CACHEABLE_EXC_WRITE : PAGE_UNCACHED;
         p->v = !(flags & PAGE_NOT_PRESENT);
-        p->d = flags & PAGE_WRITE;
+        p->d = (flags & PAGE_WRITE) != 0;
 }
 

src/Makefile.config

@@ -18 +18 @@
 
 # Uncomment if you want to compile in userspace support
-#USERSPACE=__USERSPACE__
+USERSPACE=__USERSPACE__
 
 # Uncomment if you want to run in the test mode

src/main/kinit.c

@@ -131 +131 @@
         a = vm_area_create(m, VMA_TEXT, 1, UTEXT_ADDRESS);
         if (!a) panic("vm_area_create: vm_text");
-        memcopy((__address) utext, PA2KA(a->mapping[0]), utext_size < PAGE_SIZE ? utext_size : PAGE_SIZE);              
+        memcopy((__address) utext, PA2KA(a->mapping[0]), utext_size < PAGE_SIZE ? utext_size : PAGE_SIZE);
 
         /*