prefer explicit namespaces

Author: mazunki

src/arch/x86_64/paging.cpp

@@ -33,12 +33,8 @@ const size_t  x86::paging::Map::any_size { supported_page_sizes() };
 template<>
 const size_t  os::mem::Map::any_size { supported_page_sizes() };
 
-using namespace os::mem;
 using namespace util;
 
-using Flags = x86::paging::Flags;
-using Pml4  = x86::paging::Pml4;
-
 static void allow_executable();
 
 // TODO: -Wunused-function
@@ -84,13 +80,14 @@ extern uintptr_t __exec_end;
 **/
 
 // The main page directory pointer
-Pml4* __pml4;
+x86::paging::Pml4* __pml4;
 
 __attribute__((weak))
 void __arch_init_paging() {
   INFO("x86_64", "Initializing paging");
+  using Flags = x86::paging::Flags;
   auto default_fl = Flags::present | Flags::writable | Flags::huge | Flags::no_exec;
-  __pml4 = new Pml4(0);
+  __pml4 = new x86::paging::Pml4(0);
   Expects(__pml4 != nullptr);
   Expects(!__pml4->has_flag(0, Flags::present));
 
@@ -137,23 +134,23 @@ void __arch_init_paging() {
 namespace x86 {
 namespace paging {
 
-Access to_memflags(Flags f)
+os::mem::Access to_memflags(Flags f)
 {
-  Access prot = Access::none;
+  os::mem::Access prot = os::mem::Access::none;
 
   if (! has_flag(f, Flags::present)) {
-    prot |= Access::none;
+    prot |= os::mem::Access::none;
     return prot;
   }
 
-  prot |= Access::read;
+  prot |= os::mem::Access::read;
 
   if (has_flag(f, Flags::writable)) {
-    prot |= Access::write;
+    prot |= os::mem::Access::write;
   }
 
   if (! has_flag(f, Flags::no_exec)) {
-    prot |= Access::execute;
+    prot |= os::mem::Access::execute;
   }
 
   return prot;
@@ -162,17 +159,17 @@ Access to_memflags(Flags f)
 Flags to_x86(os::mem::Access prot)
 {
   Flags flags = Flags::none;
-  if (prot != Access::none) {
+  if (prot != os::mem::Access::none) {
     flags |= Flags::present;
   } else {
     return Flags::none;
   }
 
-  if (has_flag(prot, Access::write)) {
+  if (has_flag(prot, os::mem::Access::write)) {
     flags |= Flags::writable;
   }
 
-  if (not has_flag(prot, Access::execute)) {
+  if (not has_flag(prot, os::mem::Access::execute)) {
     flags |= Flags::no_exec;
   }
 
@@ -225,11 +222,11 @@ bool mem::supported_page_size(uintptr_t size)
   return bits::is_pow2(size) and (size & supported_page_sizes()) != 0;
 }
 
-Map to_mmap(Map_x86 map){
+os::mem::Map to_mmap(os::mem::Map_x86 map){
   return {map.lin, map.phys, to_memflags(map.flags), map.size, map.page_sizes};
 }
 
-Map_x86 to_x86(Map map){
+os::mem::Map_x86 to_x86(os::mem::Map map){
   return {map.lin, map.phys, x86::paging::to_x86(map.flags), map.size, map.page_sizes};
 }
 
@@ -240,7 +237,7 @@ uintptr_t mem::virt_to_phys(uintptr_t linear)
   return __pml4->addr_of(*ent);
 }
 
-Access mem::protect_page(uintptr_t linear, Access flags)
+os::mem::Access mem::protect_page(uintptr_t linear, Access flags)
 {
   MEM_PRINT("::protect_page 0x%lx\n", linear);
   x86::paging::Flags xflags = x86::paging::to_x86(flags);
@@ -249,7 +246,7 @@ Access mem::protect_page(uintptr_t linear, Access flags)
   return to_memflags(f);
 };
 
-Access mem::protect_range(uintptr_t linear, Access flags)
+os::mem::Access mem::protect_range(uintptr_t linear, Access flags)
 {
   MEM_PRINT("::protect 0x%lx \n", linear);
   x86::paging::Flags xflags = x86::paging::to_x86(flags);
@@ -276,7 +273,7 @@ Access mem::protect_range(uintptr_t linear, Access flags)
   return to_memflags(fl);
 };
 
-Map mem::protect(uintptr_t linear, size_t len, Access flags)
+os::mem::Map mem::protect(uintptr_t linear, size_t len, Access flags)
 {
   if (UNLIKELY(len < min_psize()))
     mem_fail_fast("Can't map less than a page\n");
@@ -300,13 +297,13 @@ Map mem::protect(uintptr_t linear, size_t len, Access flags)
   return to_mmap(res);
 }
 
-Access mem::flags(uintptr_t addr)
+os::mem::Access mem::flags(uintptr_t addr)
 {
   return to_memflags(__pml4->flags_r(addr));
 }
 
 __attribute__((weak))
-Map mem::map(Map m, const char* name)
+os::mem::Map mem::map(Map m, const char* name)
 {
   using namespace x86::paging;
   using namespace util;
@@ -349,7 +346,7 @@ Map mem::map(Map m, const char* name)
   return to_mmap(new_map);
 };
 
-Map mem::unmap(uintptr_t lin){
+os::mem::Map mem::unmap(uintptr_t lin){
   auto key = os::mem::vmmap().in_range(lin);
   Map_x86 m;
   if (key) {