Moved paging related files to new subdirectories paging and paging/32bit.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37060 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/system/kernel/arch/x86/Jamfile

@@ -8,8 +8,11 @@ SubDirHdrs $(SUBDIR) timers ;
 UsePrivateKernelHeaders ;
 UsePrivateHeaders shared ;
 
+SEARCH_SOURCE += [ FDirName $(SUBDIR) paging ] ;
+SEARCH_SOURCE += [ FDirName $(SUBDIR) paging 32bit ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) timers ] ;
 
+
 KernelMergeObject kernel_arch_x86.o :
 	arch_commpage.cpp
 	arch_cpu.cpp
@@ -37,14 +40,18 @@ KernelMergeObject kernel_arch_x86.o :
 	msi.cpp
 	syscall.S
 	vm86.cpp
+
+	# paging
 	x86_physical_page_mapper.cpp
 	x86_physical_page_mapper_large_memory.cpp
 	x86_syscalls.cpp
 	X86PagingMethod.cpp
-	X86PagingMethod32Bit.cpp
 	X86PagingStructures.cpp
 	X86VMTranslationMap.cpp
 
+	# paging/32bit
+	X86PagingMethod32Bit.cpp
+
 	x86_apic.cpp
 	x86_hpet.cpp
 	x86_pit.cpp

src/system/kernel/arch/x86/arch_cpu.cpp

@@ -30,8 +30,8 @@
 #include <boot/kernel_args.h>
 
 #include "interrupts.h"
-#include "X86PagingStructures.h"
+#include "paging/X86PagingStructures.h"
-#include "X86VMTranslationMap.h"
+#include "paging/X86VMTranslationMap.h"
 
 
 #define DUMP_FEATURE_STRING 1

src/system/kernel/arch/x86/arch_thread.cpp

@@ -25,9 +25,9 @@
 #include <vm/vm_types.h>
 #include <vm/VMAddressSpace.h>
 
+#include "paging/X86PagingStructures.h"
+#include "paging/X86VMTranslationMap.h"
 #include "x86_syscalls.h"
-#include "X86PagingStructures.h"
-#include "X86VMTranslationMap.h"
 
 
 //#define TRACE_ARCH_THREAD

src/system/kernel/arch/x86/arch_vm_translation_map.cpp

@@ -10,7 +10,7 @@
 
 #include <arch/vm_translation_map.h>
 
-#include "X86PagingMethod32Bit.h"
+#include "paging/32bit/X86PagingMethod32Bit.h"
 
 
 //#define TRACE_VM_TMAP

src/system/kernel/arch/x86/paging/32bit/X86PagingMethod32Bit.cpp

@@ -8,7 +8,7 @@
  */
 
 
-#include "X86PagingMethod32Bit.h"
+#include "paging/32bit/X86PagingMethod32Bit.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -28,9 +28,9 @@
 #include <vm/VMAddressSpace.h>
 #include <vm/VMCache.h>
 
-#include "x86_physical_page_mapper.h"
+#include "paging/32bit/X86VMTranslationMap32Bit.h"
-#include "x86_physical_page_mapper_large_memory.h"
+#include "paging/x86_physical_page_mapper.h"
-#include "X86VMTranslationMap32Bit.h"
+#include "paging/x86_physical_page_mapper_large_memory.h"
 
 
 //#define TRACE_X86_PAGING_METHOD_32_BIT

src/system/kernel/arch/x86/paging/32bit/X86PagingMethod32Bit.h

@@ -2,13 +2,13 @@
  * Copyright 2010, Ingo Weinhold, ingo_weinhold@gmx.de.
  * Distributed under the terms of the MIT License.
  */
-#ifndef KERNEL_ARCH_X86_X86_PAGING_METHOD_32_BIT_H
+#ifndef KERNEL_ARCH_X86_PAGING_32_BIT_X86_PAGING_METHOD_32_BIT_H
-#define KERNEL_ARCH_X86_X86_PAGING_METHOD_32_BIT_H
+#define KERNEL_ARCH_X86_PAGING_32_BIT_X86_PAGING_METHOD_32_BIT_H
 
 
-#include "x86_paging.h"
+#include "paging/32bit/paging.h"
-#include "X86PagingMethod.h"
+#include "paging/X86PagingMethod.h"
-#include "X86PagingStructures.h"
+#include "paging/X86PagingStructures.h"
 
 
 struct X86PagingStructures32Bit : X86PagingStructures {
@@ -49,4 +49,4 @@ private:
 };
 
 
-#endif	// KERNEL_ARCH_X86_X86_PAGING_METHOD_32_BIT_H
+#endif	// KERNEL_ARCH_X86_PAGING_32_BIT_X86_PAGING_METHOD_32_BIT_H

src/system/kernel/arch/x86/paging/32bit/X86VMTranslationMap32Bit.h

@@ -2,11 +2,11 @@
  * Copyright 2010, Ingo Weinhold, ingo_weinhold@gmx.de.
  * Distributed under the terms of the MIT License.
  */
-#ifndef KERNEL_ARCH_X86_X86_VM_TRANSLATION_MAP_32_BIT_H
+#ifndef KERNEL_ARCH_X86_PAGING_32_BIT_X86_VM_TRANSLATION_MAP_32_BIT_H
-#define KERNEL_ARCH_X86_X86_VM_TRANSLATION_MAP_32_BIT_H
+#define KERNEL_ARCH_X86_PAGING_32_BIT_X86_VM_TRANSLATION_MAP_32_BIT_H
 
 
-#include "X86VMTranslationMap.h"
+#include "paging/X86VMTranslationMap.h"
 
 
 struct X86PagingStructures32Bit;
@@ -62,4 +62,4 @@ private:
 };
 
 
-#endif	// KERNEL_ARCH_X86_X86_VM_TRANSLATION_MAP_32_BIT_H
+#endif	// KERNEL_ARCH_X86_PAGING_32_BIT_X86_VM_TRANSLATION_MAP_32_BIT_H

src/system/kernel/arch/x86/paging/32bit/paging.h

@@ -6,8 +6,8 @@
  * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
  * Distributed under the terms of the NewOS License.
  */
-#ifndef _KERNEL_ARCH_X86_PAGING_H
+#ifndef _KERNEL_ARCH_X86_PAGING_32_BIT_PAGING_H
-#define _KERNEL_ARCH_X86_PAGING_H
+#define _KERNEL_ARCH_X86_PAGING_32_BIT_PAGING_H
 
 
 #include <SupportDefs.h>
@@ -19,9 +19,6 @@
 #define VADDR_TO_PTENT(va) (((va) / B_PAGE_SIZE) % 1024)
 
 
-class TranslationMapPhysicalPageMapper;
-
-
 // page directory entry bits
 #define X86_PDE_PRESENT				0x00000001
 #define X86_PDE_WRITABLE			0x00000002
@@ -103,4 +100,4 @@ set_page_table_entry_flags(page_table_entry* entry, uint32 flags)
 }
 
 
-#endif	// _KERNEL_ARCH_X86_PAGING_H
+#endif	// _KERNEL_ARCH_X86_PAGING_32_BIT_PAGING_H

src/system/kernel/arch/x86/paging/X86PagingMethod.cpp

@@ -4,7 +4,7 @@
  */
 
 
-#include "X86PagingMethod.h"
+#include "paging/X86PagingMethod.h"
 
 
 X86PagingMethod::~X86PagingMethod()

src/system/kernel/arch/x86/paging/X86PagingMethod.h

@@ -2,8 +2,8 @@
  * Copyright 2010, Ingo Weinhold, ingo_weinhold@gmx.de.
  * Distributed under the terms of the MIT License.
  */
-#ifndef KERNEL_ARCH_X86_X86_PAGING_METHOD_H
+#ifndef KERNEL_ARCH_X86_PAGING_X86_PAGING_METHOD_H
-#define KERNEL_ARCH_X86_X86_PAGING_METHOD_H
+#define KERNEL_ARCH_X86_PAGING_X86_PAGING_METHOD_H
 
 
 #include <SupportDefs.h>
@@ -38,4 +38,4 @@ public:
 };
 
 
-#endif	// KERNEL_ARCH_X86_X86_PAGING_METHOD_H
+#endif	// KERNEL_ARCH_X86_PAGING_X86_PAGING_METHOD_H

src/system/kernel/arch/x86/paging/X86PagingStructures.cpp

@@ -4,7 +4,7 @@
  */
 
 
-#include "X86PagingStructures.h"
+#include "paging/X86PagingStructures.h"
 
 
 X86PagingStructures::X86PagingStructures()

src/system/kernel/arch/x86/paging/X86PagingStructures.h

@@ -6,8 +6,8 @@
  * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
  * Distributed under the terms of the NewOS License.
  */
-#ifndef KERNEL_ARCH_X86_PAGING_STRUCTURES_H
+#ifndef KERNEL_ARCH_X86_PAGING_X86_PAGING_STRUCTURES_H
-#define KERNEL_ARCH_X86_PAGING_STRUCTURES_H
+#define KERNEL_ARCH_X86_PAGING_X86_PAGING_STRUCTURES_H
 
 
 #include <SupportDefs.h>
@@ -46,4 +46,4 @@ X86PagingStructures::RemoveReference()
 }
 
 
-#endif	// KERNEL_ARCH_X86_PAGING_STRUCTURES_H
+#endif	// KERNEL_ARCH_X86_PAGING_X86_PAGING_STRUCTURES_H

src/system/kernel/arch/x86/paging/X86VMTranslationMap.cpp

@@ -8,12 +8,12 @@
  */
 
 
-#include "X86VMTranslationMap.h"
+#include "paging/X86VMTranslationMap.h"
 
 #include <thread.h>
 #include <smp.h>
 
-#include "X86PagingStructures.h"
+#include "paging/X86PagingStructures.h"
 
 
 //#define TRACE_X86_VM_TRANSLATION_MAP

src/system/kernel/arch/x86/paging/x86_physical_page_mapper.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2008, Ingo Weinhold, ingo_weinhold@gmx.de.
+ * Copyright 2008-2010, Ingo Weinhold, ingo_weinhold@gmx.de.
  * Distributed under the terms of the MIT License.
  */
 
-#include "x86_physical_page_mapper.h"
+#include "paging/x86_physical_page_mapper.h"
 
 
 TranslationMapPhysicalPageMapper::~TranslationMapPhysicalPageMapper()

src/system/kernel/arch/x86/paging/x86_physical_page_mapper.h

@@ -2,8 +2,8 @@
  * Copyright 2008-2010, Ingo Weinhold, ingo_weinhold@gmx.de.
  * Distributed under the terms of the MIT License.
  */
-#ifndef _KERNEL_ARCH_X86_PHYSICAL_PAGE_MAPPER_H
+#ifndef KERNEL_ARCH_X86_PAGING_X86_PHYSICAL_PAGE_MAPPER_H
-#define _KERNEL_ARCH_X86_PHYSICAL_PAGE_MAPPER_H
+#define KERNEL_ARCH_X86_PAGING_X86_PHYSICAL_PAGE_MAPPER_H
 
 
 #include <vm/VMTranslationMap.h>
@@ -37,4 +37,4 @@ public:
 };
 
 
-#endif	// _KERNEL_ARCH_X86_PHYSICAL_PAGE_MAPPER_H
+#endif	// KERNEL_ARCH_X86_PAGING_X86_PHYSICAL_PAGE_MAPPER_H

src/system/kernel/arch/x86/paging/x86_physical_page_mapper_large_memory.cpp

@@ -23,7 +23,7 @@
 */
 
 
-#include "x86_physical_page_mapper_large_memory.h"
+#include "paging/x86_physical_page_mapper_large_memory.h"
 
 #include <new>
 
@@ -37,9 +37,9 @@
 #include <vm/vm_types.h>
 #include <vm/VMAddressSpace.h>
 
-#include "x86_physical_page_mapper.h"
+#include "paging/x86_physical_page_mapper.h"
-#include "X86PagingStructures.h"
+#include "paging/X86PagingStructures.h"
-#include "X86VMTranslationMap.h"
+#include "paging/X86VMTranslationMap.h"
 
 
 // The number of slots we reserve per translation map from mapping page tables.

src/system/kernel/arch/x86/paging/x86_physical_page_mapper_large_memory.h

@@ -2,8 +2,8 @@
  * Copyright 2010, Ingo Weinhold, ingo_weinhold@gmx.de.
  * Distributed under the terms of the MIT License.
  */
-#ifndef KERNEL_ARCH_X86_X86_PHYSICAL_PAGE_MAPPER_LARGE_MEMORY_H
+#ifndef KERNEL_ARCH_X86_PAGING_X86_PHYSICAL_PAGE_MAPPER_LARGE_MEMORY_H
-#define KERNEL_ARCH_X86_X86_PHYSICAL_PAGE_MAPPER_LARGE_MEMORY_H
+#define KERNEL_ARCH_X86_PAGING_X86_PHYSICAL_PAGE_MAPPER_LARGE_MEMORY_H
 
 
 #include <OS.h>
@@ -58,4 +58,4 @@ status_t large_memory_physical_page_ops_init(kernel_args* args,
 	TranslationMapPhysicalPageMapper*& _kernelPageMapper);
 
 
-#endif	// KERNEL_ARCH_X86_X86_PHYSICAL_PAGE_MAPPER_LARGE_MEMORY_H
+#endif	// KERNEL_ARCH_X86_PAGING_X86_PHYSICAL_PAGE_MAPPER_LARGE_MEMORY_H