[ros-diffs] [tkreuzer] 49012: [NTOSKRNL] - Add amd64 versions of MI_MAKE_PROTOTYPE_PTE and MiProtoPteToPte - Remove outdated external declarations - disable deprecated amd64 code - use MiFillSystemPageDirector...

Author: tkreuzer
Date: Wed Oct  6 12:16:51 2010
New Revision: 49012

URL: http://svn.reactos.org/svn/reactos?rev=49012&view=rev
Log:
[NTOSKRNL] 
- Add amd64 versions of MI_MAKE_PROTOTYPE_PTE and MiProtoPteToPte
- Remove outdated external declarations
- disable deprecated amd64 code
- use MiFillSystemPageDirectory only for 2 paging levels
- Fixes amd64 build

Modified:
    trunk/reactos/ntoskrnl/include/internal/amd64/mm.h
    trunk/reactos/ntoskrnl/include/internal/mm.h
    trunk/reactos/ntoskrnl/mm/ARM3/miarm.h
    trunk/reactos/ntoskrnl/mm/ARM3/section.c
    trunk/reactos/ntoskrnl/mm/amd64/init.c

Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Wed Oct  6 12:16:51
2010
@@ -151,6 +151,27 @@
 #define VAtoPPI(va) ((((ULONG64)va) >> PPI_SHIFT) & 0x1FF)
 #define VAtoPDI(va) ((((ULONG64)va) >> PDI_SHIFT) & 0x1FF)
 #define VAtoPTI(va) ((((ULONG64)va) >> PTI_SHIFT) & 0x1FF)
+
+FORCEINLINE
+VOID
+MI_MAKE_PROTOTYPE_PTE(IN PMMPTE NewPte,
+                      IN PMMPTE PointerPte)
+{
+    ULONG_PTR Offset;
+
+    /* Store the Address */
+    NewPte->u.Long = (ULONG64)PointerPte;
+
+    /* Mark this as a prototype PTE */
+    NewPte->u.Proto.Prototype = 1;
+    NewPte->u.Proto.Valid  = 1;
+    NewPte->u.Proto.ReadOnly = 0;
+    NewPte->u.Proto.Protection = 0;
+}
+
+/* Sign extend 48 bits */
+#define MiProtoPteToPte(x)                  \
+    (PMMPTE)((LONG64)(x)->u.Proto.ProtoAddress)
 
 /* We don't use these hacks */
 VOID

Modified: trunk/reactos/ntoskrnl/include/internal/mm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Wed Oct  6 12:16:51 2010
@@ -8,7 +8,6 @@
 
 extern PFN_NUMBER MiFreeSwapPages;
 extern PFN_NUMBER MiUsedSwapPages;
-extern SIZE_T MmPagedPoolSize;
 extern SIZE_T MmTotalPagedPoolQuota;
 extern SIZE_T MmTotalNonPagedPoolQuota;
 extern PHYSICAL_ADDRESS MmSharedDataPagePhysicalAddress;
@@ -18,9 +17,6 @@
 extern PFN_NUMBER MmHighestPhysicalPage;
 extern PFN_NUMBER MmAvailablePages;
 extern PFN_NUMBER MmResidentAvailablePages;
-
-extern PVOID MmPagedPoolBase;
-extern SIZE_T MmPagedPoolSize;
 
 extern PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor;
 extern MEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptorOrg;

Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Oct  6 12:16:51 2010
@@ -236,12 +236,14 @@
 #define MI_GET_NEXT_COLOR(x)                (MI_GET_PAGE_COLOR(++MmSystemPageColor))
 #define MI_GET_NEXT_PROCESS_COLOR(x)        (MI_GET_PAGE_COLOR(++(x)->NextPageColor))
 
+#ifdef _M_IX86
 //
 // Decodes a Prototype PTE into the underlying PTE
 //
 #define MiProtoPteToPte(x)                  \
     (PMMPTE)((ULONG_PTR)MmPagedPoolStart +  \
              ((x)->u.Proto.ProtoAddressHigh | (x)->u.Proto.ProtoAddressLow))
+#endif
 
 //
 // Prototype PTEs that don't yet have a pagefile association
@@ -603,6 +605,7 @@
     NewPte->u.Long |= MmProtectToPteMask[ProtectionMask];
 }
 
+#ifdef _M_IX86
 //
 // Builds a Prototype PTE for the address of the PTE
 //
@@ -627,6 +630,7 @@
     NewPte->u.Proto.ProtoAddressLow = Offset & 0x7F;
     NewPte->u.Proto.ProtoAddressHigh = Offset & 0xFFFFF80;
 }
+#endif
 
 //
 // Returns if the page is physically resident (ie: a large page)

Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Wed Oct  6 12:16:51 2010
@@ -309,6 +309,7 @@
     return STATUS_SUCCESS;
 }
 
+#if (_MI_PAGING_LEVELS == 2)
 VOID
 NTAPI
 MiFillSystemPageDirectory(IN PVOID Base,
@@ -364,6 +365,7 @@
         PointerPde++;
     }
 }
+#endif
 
 NTSTATUS
 NTAPI
@@ -449,8 +451,10 @@
     Base = MiInsertInSystemSpace(Session, Buckets, ControlArea);
     ASSERT(Base);
 
+#if (_MI_PAGING_LEVELS == 2)
     /* Create the PDEs needed for this mapping, and double-map them if needed */
     MiFillSystemPageDirectory(Base, Buckets * MI_SYSTEM_VIEW_BUCKET_SIZE);
+#endif
 
     /* Create the actual prototype PTEs for this mapping */
     Status = MiAddMappedPtes(MiAddressToPte(Base),

Modified: trunk/reactos/ntoskrnl/mm/amd64/init.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/init.c?r…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Wed Oct  6 12:16:51 2010
@@ -857,9 +857,9 @@
         //MiBuildPagedPool();
 
         // This is the old stuff:
-        MmPagedPoolBase = (PVOID)((PCHAR)MmPagedPoolEnd + 1);
-        MmPagedPoolSize = MM_PAGED_POOL_SIZE;
-        ASSERT((PCHAR)MmPagedPoolBase + MmPagedPoolSize <
(PCHAR)MmNonPagedSystemStart);
+        //MmPagedPoolBase = (PVOID)((PCHAR)MmPagedPoolEnd + 1);
+        //MmPagedPoolSize = MM_PAGED_POOL_SIZE;
+        //ASSERT((PCHAR)MmPagedPoolBase + MmPagedPoolSize <
(PCHAR)MmNonPagedSystemStart);
 
         
         HalInitializeBios(0, LoaderBlock);