Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[ros-arm-bringup] 41981: - Start re-defining the PTE and PDE structures for: - ARMv6 support. - Support of new ARM3 and overall portability. - Still have to find a better way to deal with the fact that PDE/PTE types are different on ARM. - Fix the current arm low-level mm implementation to use the new structures. - However parts of the code will now be totaly obsoleted by the new ARMv6 MMU support. - The ARM port now builds again.
by ros-arm-bringup＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: ros-arm-bringup Date: Wed Jul 15 20:20:53 2009 New Revision: 41981 URL: http://svn.reactos.org/svn/reactos?rev=41981&view=rev Log: - Start re-defining the PTE and PDE structures for: - ARMv6 support. - Support of new ARM3 and overall portability. - Still have to find a better way to deal with the fact that PDE/PTE types are different on ARM. - Fix the current arm low-level mm implementation to use the new structures. - However parts of the code will now be totaly obsoleted by the new ARMv6 MMU support. - The ARM port now builds again. Modified: trunk/reactos/include/ndk/arm/mmtypes.h trunk/reactos/ntoskrnl/include/internal/arm/mm.h trunk/reactos/ntoskrnl/mm/arm/stubs.c Modified: trunk/reactos/include/ndk/arm/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/mmtypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] Wed Jul 15 20:20:53 2009 @@ -185,7 +185,7 @@ ULONG filler1:1; } MMPTE_LIST; -typedef struct _MMPTE_HARDWARE +typedef struct _MMPDE_HARDWARE // FIXFIX: Find a way to make this more portable { union { @@ -193,81 +193,50 @@ { struct { - ULONG Type:2; - ULONG Unused:30; - } Fault; - struct - { - ULONG Type:2; - ULONG Ignored:2; + ULONG Valid:1; + ULONG Section:1; + ULONG Sbz:3; + ULONG Domain:4; + ULONG EccEnabled:1; + ULONG PageFrameNumber:22; + } Coarse; + struct + { + ULONG Coarse:1; + ULONG Valid:1; + ULONG Buffered:1; + ULONG Cached:1; ULONG Reserved:1; ULONG Domain:4; - ULONG Ignored1:1; - ULONG BaseAddress:22; - } Coarse; - struct - { - ULONG Type:2; - ULONG Buffered:1; - ULONG Cached:1; - ULONG Reserved:1; - ULONG Domain:4; - ULONG Ignored:1; + ULONG EccEnabled:1; ULONG Access:2; - ULONG Ignored1:8; - ULONG BaseAddress:12; + ULONG ExtendedAccess:3; + ULONG Sbz:3; + ULONG SuperSection:1; + ULONG Sbz1:1; + ULONG PageFrameNumber:12; } Section; - struct - { - ULONG Type:2; - ULONG Reserved:3; - ULONG Domain:4; - ULONG Ignored:3; - ULONG BaseAddress:20; - } Fine; - } L1; - union - { - struct - { - ULONG Type:2; - ULONG Unused:30; - } Fault; - struct - { - ULONG Type:2; - ULONG Buffered:1; - ULONG Cached:1; - ULONG Access0:2; - ULONG Access1:2; - ULONG Access2:2; - ULONG Access3:2; - ULONG Ignored:4; - ULONG BaseAddress:16; - } Large; - struct - { - ULONG Type:2; - ULONG Buffered:1; - ULONG Cached:1; - ULONG Access0:2; - ULONG Access1:2; - ULONG Access2:2; - ULONG Access3:2; - ULONG BaseAddress:20; - } Small; - struct - { - ULONG Type:2; - ULONG Buffered:1; - ULONG Cached:1; - ULONG Access0:2; - ULONG Ignored:4; - ULONG BaseAddress:22; - } Tiny; - } L2; - ULONG AsUlong; + ULONG AsUlong; + } Hard; + } u; +} MMPDE_HARDWARE, *PMMPDE_HARDWARE; + +typedef union _MMPTE_HARDWARE +{ + struct + { + ULONG ExecuteNever:1; + ULONG Valid:1; + ULONG Buffered:1; + ULONG Cached:1; + ULONG Access:2; + ULONG TypeExtension:3; + ULONG ExtendedAccess:1; + ULONG Shared:1; + ULONG NonGlobal:1; + ULONG PageFrameNumber:20; }; + ULONG AsUlong; } MMPTE_HARDWARE, *PMMPTE_HARDWARE; // Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Wed Jul 15 20:20:53 2009 @@ -7,6 +7,12 @@ #define PDE_SHIFT 20 #define PDE_SIZE (1 << PDE_SHIFT) + +// +// FIXFIX: This is all wrong now!!! +// + + // // Number of bits corresponding to the area that a coarse page table entry represents (4KB) // @@ -19,6 +25,11 @@ #define CPT_SHIFT 10 #define CPT_SIZE (1 << CPT_SHIFT) + + +// +// FIXFIX: This is all wrong now!!! +// typedef union _ARM_PTE { union @@ -143,6 +154,11 @@ ManagerDomain } ARM_DOMAIN; + +// +// FIXFIX: This is all wrong now!!! +// + // // Take 0x80812345 and extract: // PTE_BASE[0x808][0x12] @@ -153,7 +169,7 @@ ((((ULONG)(x) >> 12) & 0xFF) << 2)) #define MiGetPdeAddress(x) \ - (PMMPTE)(PDE_BASE + \ + (PMMPDE_HARDWARE)(PDE_BASE + \ (((ULONG)(x) >> 20) << 2)) #define MiGetPdeOffset(x) (((ULONG)(x)) >> 22) @@ -165,4 +181,36 @@ struct _EPROCESS; PULONG MmGetPageDirectory(VOID); + +// +// FIXME: THESE ARE WRONG ATM. +// +#define MiAddressToPde(x) \ +((PMMPTE)(((((ULONG)(x)) >> 22) << 2) + PDE_BASE)) +#define MiAddressToPte(x) \ +((PMMPTE)(((((ULONG)(x)) >> 12) << 2) + PTE_BASE)) +#define MiAddressToPteOffset(x) \ +((((ULONG)(x)) << 10) >> 22) + +// +// Convert a PTE into a corresponding address +// +#define MiPteToAddress(PTE) ((PVOID)((ULONG)(PTE) << 10)) + +#define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) +#define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE))) +#define ADDR_TO_PTE_OFFSET(v) ((((ULONG)(v)) % (1024 * PAGE_SIZE)) / PAGE_SIZE) + +#define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.NonGlobal = 1) +#define MI_MAKE_DIRTY_PAGE(x) +#define MI_PAGE_DISABLE_CACHE(x) ((x)->u.Hard.Cached = 0) +#define MI_PAGE_WRITE_THROUGH(x) ((x)->u.Hard.Buffered = 0) +#define MI_PAGE_WRITE_COMBINED(x) ((x)->u.Hard.Buffered = 1) +#define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.ExtendedAccess == 0) +#define MI_IS_PAGE_COPY_ON_WRITE(x)FALSE +#define MI_IS_PAGE_DIRTY(x) TRUE + +/* Easy accessing PFN in PTE */ +#define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) + #endif Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Wed Jul 15 20:20:53 2009 @@ -15,7 +15,8 @@ /* GLOBALS ********************************************************************/ ULONG MmGlobalKernelPageDirectory[1024]; -MMPTE MiArmTemplatePte, MiArmTemplatePde; +MMPTE MiArmTemplatePte; +MMPDE_HARDWARE MiArmTemplatePde; /* PRIVATE FUNCTIONS **********************************************************/ @@ -67,8 +68,10 @@ IN BOOLEAN Create) { //ULONG PdeOffset; - PMMPTE PointerPde, PointerPte; - MMPTE TempPde, TempPte; + PMMPTE PointerPte; + PMMPDE_HARDWARE PointerPde; + MMPDE_HARDWARE TempPde; + MMPTE TempPte; NTSTATUS Status; PFN_NUMBER Pfn; @@ -95,7 +98,7 @@ // Get the PDE // PointerPde = MiGetPdeAddress(Address); - if (PointerPde->u.Hard.L1.Fault.Type == FaultPte) + if (PointerPde->u.Hard.Coarse.Valid) { // // Invalid PDE, is this a kernel address? @@ -125,13 +128,13 @@ // // Setup the PFN // - TempPde.u.Hard.L1.Coarse.BaseAddress = (Pfn << PAGE_SHIFT) >> CPT_SHIFT; + TempPde.u.Hard.Coarse.PageFrameNumber = (Pfn << PAGE_SHIFT) >> CPT_SHIFT; // // Write the PDE // - ASSERT(PointerPde->u.Hard.L1.Fault.Type == FaultPte); - ASSERT(TempPde.u.Hard.L1.Coarse.Type == CoarsePte); + ASSERT(PointerPde->u.Hard.Coarse.Valid == 0); + ASSERT(TempPde.u.Hard.Coarse.Valid == 1); *PointerPde = TempPde; // @@ -153,13 +156,13 @@ // // Write the PFN of the PDE // - TempPte.u.Hard.L2.Small.BaseAddress = Pfn; + TempPte.u.Hard.PageFrameNumber = Pfn; // // Write the PTE // - ASSERT(PointerPte->u.Hard.L2.Fault.Type == FaultPte); - ASSERT(TempPte.u.Hard.L2.Small.Type == SmallPte); + ASSERT(PointerPte->u.Hard.Valid == 0); + ASSERT(TempPte.u.Hard.Valid == 1); *PointerPte = TempPte; ///// } @@ -191,12 +194,12 @@ // // Make the entry valid // - TempPte.u.Hard.AsUlong = 0xDEADBEEF; + TempPde.u.Hard.AsUlong = 0xDEADBEEF; // // Set it // - *PointerPde = TempPte; + *PointerPde = TempPde; } } @@ -239,7 +242,7 @@ MmDeletePageTable(IN PEPROCESS Process, IN PVOID Address) { - PMMPTE PointerPde; + PMMPDE_HARDWARE PointerPde; // // Not valid for kernel addresses @@ -266,24 +269,24 @@ // // On ARM, we use a section mapping for the original low-memory mapping // - if ((Address) || (PointerPde->u.Hard.L1.Section.Type != SectionPte)) + if ((Address) || (PointerPde->u.Hard.Section.Valid == 0)) { // // Make sure it's valid // - ASSERT(PointerPde->u.Hard.L1.Coarse.Type == CoarsePte); + ASSERT(PointerPde->u.Hard.Coarse.Valid == 1); } // // Clear the PDE // PointerPde->u.Hard.AsUlong = 0; - ASSERT(PointerPde->u.Hard.L1.Fault.Type == FaultPte); + ASSERT(PointerPde->u.Hard.Coarse.Valid == 0); // // Invalidate the TLB entry // - MiFlushTlb(PointerPde, MiGetPteAddress(Address)); + MiFlushTlb((PMMPTE)PointerPde, MiGetPteAddress(Address)); } BOOLEAN @@ -295,8 +298,8 @@ NTSTATUS Status; ULONG i; PFN_NUMBER Pfn[2]; - PMMPTE PageDirectory, PointerPde; - MMPTE TempPde; + PMMPDE_HARDWARE PageDirectory, PointerPde; + MMPDE_HARDWARE TempPde; ASSERT(FALSE); // @@ -329,27 +332,27 @@ // Setup the PDE for the table base // TempPde = MiArmTemplatePde; - TempPde.u.Hard.L1.Coarse.BaseAddress = (Pfn[0] << PAGE_SHIFT) >> CPT_SHIFT; + TempPde.u.Hard.Coarse.PageFrameNumber = (Pfn[0] << PAGE_SHIFT) >> CPT_SHIFT; PointerPde = &PageDirectory[MiGetPdeOffset(PTE_BASE)]; // // Write the PDE // - ASSERT(PointerPde->u.Hard.L1.Fault.Type == FaultPte); - ASSERT(TempPde.u.Hard.L1.Coarse.Type == CoarsePte); + ASSERT(PointerPde->u.Hard.Coarse.Valid == 0); + ASSERT(TempPde.u.Hard.Coarse.Valid == 1); *PointerPde = TempPde; // // Setup the PDE for the hyperspace // - TempPde.u.Hard.L1.Coarse.BaseAddress = (Pfn[1] << PAGE_SHIFT) >> CPT_SHIFT; + TempPde.u.Hard.Coarse.PageFrameNumber = (Pfn[1] << PAGE_SHIFT) >> CPT_SHIFT; PointerPde = &PageDirectory[MiGetPdeOffset(HYPER_SPACE)]; // // Write the PDE // - ASSERT(PointerPde->u.Hard.L1.Fault.Type == FaultPte); - ASSERT(TempPde.u.Hard.L1.Coarse.Type == CoarsePte); + ASSERT(PointerPde->u.Hard.Coarse.Valid == 0); + ASSERT(TempPde.u.Hard.Coarse.Valid == 1); *PointerPde = TempPde; // @@ -515,13 +518,13 @@ // // Set the PFN // - TempPte.u.Hard.L2.Small.BaseAddress = *Pages++; + TempPte.u.Hard.PageFrameNumber = *Pages++; // // Write the PTE // - ASSERT(PointerPte->u.Hard.L2.Fault.Type == FaultPte); - ASSERT(TempPte.u.Hard.L2.Small.Type == SmallPte); + ASSERT(PointerPte->u.Hard.Valid == 0); + ASSERT(TempPte.u.Hard.Valid == 1); *PointerPte = TempPte; // @@ -626,7 +629,7 @@ // Get the PTE // PointerPte = MiGetPageTableForProcess(NULL, Address, FALSE); - if ((PointerPte) && (PointerPte->u.Hard.L2.Fault.Type != FaultPte)) + if ((PointerPte) && (PointerPte->u.Hard.Valid)) { // // Destroy it @@ -672,7 +675,7 @@ // // Unmap the PFN // - Pfn = Pte.u.Hard.L2.Small.BaseAddress; + Pfn = Pte.u.Hard.PageFrameNumber; if (Pfn) MmMarkPageUnmapped(Pfn); // @@ -726,12 +729,12 @@ // Get the PTE // Pte = MiGetPageEntryForProcess(Process, Address); - if (Pte.u.Hard.L2.Fault.Type == FaultPte) return 0; + if (Pte.u.Hard.Valid == 0) return 0; // // Return PFN // - return Pte.u.Hard.L2.Small.BaseAddress; + return Pte.u.Hard.PageFrameNumber; } BOOLEAN @@ -779,7 +782,7 @@ // // Fault PTEs are 0, which is FALSE (non-present) // - return MiGetPageEntryForProcess(Process, Address).u.Hard.L2.Fault.Type; + return MiGetPageEntryForProcess(Process, Address).u.Hard.Valid; } BOOLEAN @@ -795,9 +798,9 @@ Pte = MiGetPageEntryForProcess(Process, Address); // - // Make sure it's valid, but faulting - // - return (Pte.u.Hard.L2.Fault.Type == FaultPte) && (Pte.u.Hard.AsUlong); + // Make sure it exists, but is faulting + // + return (Pte.u.Hard.Valid == 0) && (Pte.u.Hard.AsUlong); } ULONG @@ -934,10 +937,10 @@ // // ARM Hack while we still use a section PTE // - PMMPTE PointerPte; - PointerPte = MiGetPdeAddress(PCR); - ASSERT(PointerPte->u.Hard.L1.Section.Type == SectionPte); - PhysicalAddress.QuadPart = PointerPte->u.Hard.L1.Section.BaseAddress; + PMMPDE_HARDWARE PointerPde; + PointerPde = MiGetPdeAddress(PCR); + ASSERT(PointerPde->u.Hard.Section.Valid == 1); + PhysicalAddress.QuadPart = PointerPde->u.Hard.Section.PageFrameNumber; PhysicalAddress.QuadPart <<= CPT_SHIFT; PhysicalAddress.LowPart += BYTE_OFFSET(Address); return PhysicalAddress; @@ -947,13 +950,12 @@ // Get the PTE // Pte = MiGetPageEntryForProcess(NULL, Address); - if ((Pte.u.Hard.AsUlong) && (Pte.u.Hard.L2.Fault.Type != FaultPte)) + if (Pte.u.Hard.Valid) { // // Return the information // - ASSERT(Pte.u.Hard.L2.Small.Type == SmallPte); - PhysicalAddress.QuadPart = Pte.u.Hard.L2.Small.BaseAddress; + PhysicalAddress.QuadPart = Pte.u.Hard.PageFrameNumber; PhysicalAddress.QuadPart <<= PAGE_SHIFT; PhysicalAddress.LowPart += BYTE_OFFSET(Address); }

1 0

[ros-arm-bringup] 41980: - Move ARM3's init.c to i386-specific directory.
by ros-arm-bringup＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: ros-arm-bringup Date: Wed Jul 15 19:55:13 2009 New Revision: 41980 URL: http://svn.reactos.org/svn/reactos?rev=41980&view=rev Log: - Move ARM3's init.c to i386-specific directory. Added: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c - copied, changed from r41932, trunk/reactos/ntoskrnl/mm/ARM3/init.c Removed: trunk/reactos/ntoskrnl/mm/ARM3/init.c Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Copied: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c (from r41932, trunk/reactos/ntoskrnl/mm/ARM3/init.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Wed Jul 15 19:55:13 2009 @@ -14,7 +14,7 @@ #line 15 "ARMÂ³::INIT" #define MODULE_INVOLVED_IN_ARM3 -#include "../ARM3/miarm.h" +#include "../../ARM3/miarm.h" /* GLOBALS ********************************************************************/ @@ -138,7 +138,7 @@ // This both odious and heinous // extern ULONG MmGlobalKernelPageDirectory[1024]; - MmGlobalKernelPageDirectory[Pde] = ((PULONG)PAGEDIRECTORY_MAP)[Pde]; + MmGlobalKernelPageDirectory[Pde] = ((PULONG)PDE_BASE)[Pde]; Pde++; } } @@ -302,7 +302,7 @@ // // Set CR3 for the system process // - PointerPte = MiAddressToPde(PAGETABLE_MAP); + PointerPte = MiAddressToPde(PTE_BASE); PageFrameIndex = PFN_FROM_PTE(PointerPte) << PAGE_SHIFT; PsGetCurrentProcess()->Pcb.DirectoryTableBase[0] = PageFrameIndex; Removed: trunk/reactos/ntoskrnl/mm/ARM3/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/init.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/init.c (removed) @@ -1,776 +1,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: ntoskrnl/mm/ARM3/init.c - * PURPOSE: ARM Memory Manager Initialization - * PROGRAMMERS: ReactOS Portable Systems Group - */ - -/* INCLUDES *******************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - -#line 15 "ARMÂ³::INIT" -#define MODULE_INVOLVED_IN_ARM3 -#include "../ARM3/miarm.h" - -/* GLOBALS ********************************************************************/ - -// -// These are all registry-configurable, but by default, the memory manager will -// figure out the most appropriate values. -// -ULONG MmMaximumNonPagedPoolPercent; -ULONG MmSizeOfNonPagedPoolInBytes; -ULONG MmMaximumNonPagedPoolInBytes; - -// -// These numbers describe the discrete equation components of the nonpaged -// pool sizing algorithm. -// -// They are described on http://support.microsoft.com/default.aspx/kb/126402/ja -// along with the algorithm that uses them, which is implemented later below. -// -ULONG MmMinimumNonPagedPoolSize = 256 * 1024; -ULONG MmMinAdditionNonPagedPoolPerMb = 32 * 1024; -ULONG MmDefaultMaximumNonPagedPool = 1024 * 1024; -ULONG MmMaxAdditionNonPagedPoolPerMb = 400 * 1024; - -// -// The memory layout (and especially variable names) of the NT kernel mode -// components can be a bit hard to twig, especially when it comes to the non -// paged area. -// -// There are really two components to the non-paged pool: -// -// - The initial nonpaged pool, sized dynamically up to a maximum. -// - The expansion nonpaged pool, sized dynamically up to a maximum. -// -// The initial nonpaged pool is physically continuous for performance, and -// immediately follows the PFN database, typically sharing the same PDE. It is -// a very small resource (32MB on a 1GB system), and capped at 128MB. -// -// Right now, we call this the "ARM Pool" and it begins somewhere after the ARM -// PFN database (which starts at 0xB0000000). -// -// The expansion nonpaged pool, on the other hand, can grow much bigger (400MB -// for a 1GB system). On ARMÂ³ however, it is currently capped at 128MB. -// -// The address where the initial nonpaged pool starts is aptly named -// MmNonPagedPoolStart, and it describes a range of MmSizeOfNonPagedPoolInBytes -// bytes. -// -// Expansion nonpaged pool starts at an address described by the variable called -// MmNonPagedPoolExpansionStart, and it goes on for MmMaximumNonPagedPoolInBytes -// minus MmSizeOfNonPagedPoolInBytes bytes, always reaching MmNonPagedPoolEnd -// (because of the way it's calculated) at 0xFFBE0000. -// -// Initial nonpaged pool is allocated and mapped early-on during boot, but what -// about the expansion nonpaged pool? It is instead composed of special pages -// which belong to what are called System PTEs. These PTEs are the matter of a -// later discussion, but they are also considered part of the "nonpaged" OS, due -// to the fact that they are never paged out -- once an address is described by -// a System PTE, it is always valid, until the System PTE is torn down. -// -// System PTEs are actually composed of two "spaces", the system space proper, -// and the nonpaged pool expansion space. The latter, as we've already seen, -// begins at MmNonPagedPoolExpansionStart. Based on the number of System PTEs -// that the system will support, the remaining address space below this address -// is used to hold the system space PTEs. This address, in turn, is held in the -// variable named MmNonPagedSystemStart, which itself is never allowed to go -// below 0xEB000000 (thus creating an upper bound on the number of System PTEs). -// -// This means that 330MB are reserved for total nonpaged system VA, on top of -// whatever the initial nonpaged pool allocation is. -// -// The following URLs, valid as of April 23rd, 2008, support this evidence: -// -// http://www.cs.miami.edu/~burt/journal/NT/memory.html -// http://www.ditii.com/2007/09/28/windows-memory-management-x86-virtual-addre… -// -PVOID MmNonPagedSystemStart; -PVOID MmNonPagedPoolStart; -PVOID MmNonPagedPoolExpansionStart; -PVOID MmNonPagedPoolEnd = (PVOID)0xFFBE0000; - -// -// Windows NT seems to choose between 7000, 11000 and 50000 -// On systems with more than 32MB, this number is then doubled, and further -// aligned up to a PDE boundary (4MB). -// -ULONG MmNumberOfSystemPtes; - -// -// This is how many pages the PFN database will take up -// In Windows, this includes the Quark Color Table, but not in ARMÂ³ -// -ULONG MxPfnAllocation; - -// -// The ARMÂ³ PFN Database -// -PMMPFN MmArmPfnDatabase; - -// -// This structure describes the different pieces of RAM-backed address space -// -PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; - -/* PRIVATE FUNCTIONS **********************************************************/ - -// -// In Bavaria, this is probably a hate crime -// -VOID -FASTCALL -MiSyncARM3WithROS(IN PVOID AddressStart, - IN PVOID AddressEnd) -{ - // - // Puerile piece of junk-grade carbonized horseshit puss sold to the lowest bidder - // - ULONG Pde = ADDR_TO_PDE_OFFSET(AddressStart); - while (Pde <= ADDR_TO_PDE_OFFSET(AddressEnd)) - { - // - // This both odious and heinous - // - extern ULONG MmGlobalKernelPageDirectory[1024]; - MmGlobalKernelPageDirectory[Pde] = ((PULONG)PAGEDIRECTORY_MAP)[Pde]; - Pde++; - } -} - -PPHYSICAL_MEMORY_DESCRIPTOR -NTAPI -MmInitializeMemoryLimits(IN PLOADER_PARAMETER_BLOCK LoaderBlock, - IN PBOOLEAN IncludeType) -{ - PLIST_ENTRY NextEntry; - ULONG Run = 0, InitialRuns = 0; - PFN_NUMBER NextPage = -1, PageCount = 0; - PPHYSICAL_MEMORY_DESCRIPTOR Buffer, NewBuffer; - PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; - - // - // Scan the memory descriptors - // - NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; - while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) - { - // - // For each one, increase the memory allocation estimate - // - InitialRuns++; - NextEntry = NextEntry->Flink; - } - - // - // Allocate the maximum we'll ever need - // - Buffer = ExAllocatePoolWithTag(NonPagedPool, - sizeof(PHYSICAL_MEMORY_DESCRIPTOR) + - sizeof(PHYSICAL_MEMORY_RUN) * - (InitialRuns - 1), - 'lMmM'); - if (!Buffer) return NULL; - - // - // For now that's how many runs we have - // - Buffer->NumberOfRuns = InitialRuns; - - // - // Now loop through the descriptors again - // - NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; - while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) - { - // - // Grab each one, and check if it's one we should include - // - MdBlock = CONTAINING_RECORD(NextEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - if ((MdBlock->MemoryType < LoaderMaximum) && - (IncludeType[MdBlock->MemoryType])) - { - // - // Add this to our running total - // - PageCount += MdBlock->PageCount; - - // - // Check if the next page is described by the next descriptor - // - if (MdBlock->BasePage == NextPage) - { - // - // Combine it into the same physical run - // - ASSERT(MdBlock->PageCount != 0); - Buffer->Run[Run - 1].PageCount += MdBlock->PageCount; - NextPage += MdBlock->PageCount; - } - else - { - // - // Otherwise just duplicate the descriptor's contents - // - Buffer->Run[Run].BasePage = MdBlock->BasePage; - Buffer->Run[Run].PageCount = MdBlock->PageCount; - NextPage = Buffer->Run[Run].BasePage + Buffer->Run[Run].PageCount; - - // - // And in this case, increase the number of runs - // - Run++; - } - } - - // - // Try the next descriptor - // - NextEntry = MdBlock->ListEntry.Flink; - } - - // - // We should not have been able to go past our initial estimate - // - ASSERT(Run <= Buffer->NumberOfRuns); - - // - // Our guess was probably exaggerated... - // - if (InitialRuns > Run) - { - // - // Allocate a more accurately sized buffer - // - NewBuffer = ExAllocatePoolWithTag(NonPagedPool, - sizeof(PHYSICAL_MEMORY_DESCRIPTOR) + - sizeof(PHYSICAL_MEMORY_RUN) * - (Run - 1), - 'lMmM'); - if (NewBuffer) - { - // - // Copy the old buffer into the new, then free it - // - RtlCopyMemory(NewBuffer->Run, - Buffer->Run, - sizeof(PHYSICAL_MEMORY_RUN) * Run); - ExFreePool(Buffer); - - // - // Now use the new buffer - // - Buffer = NewBuffer; - } - } - - // - // Write the final numbers, and return it - // - Buffer->NumberOfRuns = Run; - Buffer->NumberOfPages = PageCount; - return Buffer; -} - -NTSTATUS -NTAPI -MmArmInitSystem(IN ULONG Phase, - IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PMEMORY_AREA MArea; - PHYSICAL_ADDRESS BoundaryAddressMultiple, Low, High; - PFN_NUMBER PageFrameIndex; - PMMPTE StartPde, EndPde, PointerPte, LastPte; - MMPTE TempPde = HyperTemplatePte, TempPte = HyperTemplatePte; - PVOID NonPagedPoolExpansionVa, BaseAddress; - NTSTATUS Status; - ULONG OldCount; - BOOLEAN IncludeType[LoaderMaximum]; - ULONG i; - BoundaryAddressMultiple.QuadPart = Low.QuadPart = 0; - High.QuadPart = -1; - - if (Phase == 0) - { - // - // Set CR3 for the system process - // - PointerPte = MiAddressToPde(PAGETABLE_MAP); - PageFrameIndex = PFN_FROM_PTE(PointerPte) << PAGE_SHIFT; - PsGetCurrentProcess()->Pcb.DirectoryTableBase[0] = PageFrameIndex; - - // - // Blow away user-mode - // - StartPde = MiAddressToPde(0); - EndPde = MiAddressToPde(KSEG0_BASE); - RtlZeroMemory(StartPde, (EndPde - StartPde) * sizeof(MMPTE)); - - // - // Check if this is a machine with less than 19MB of RAM - // - if (MmNumberOfPhysicalPages < MI_MIN_PAGES_FOR_SYSPTE_TUNING) - { - // - // Use the very minimum of system PTEs - // - MmNumberOfSystemPtes = 7000; - } - else - { - // - // Use the default, but check if we have more than 32MB of RAM - // - MmNumberOfSystemPtes = 11000; - if (MmNumberOfPhysicalPages > MI_MIN_PAGES_FOR_SYSPTE_BOOST) - { - // - // Double the amount of system PTEs - // - MmNumberOfSystemPtes <<= 1; - } - } - - DPRINT("System PTE count has been tuned to %d (%d bytes)\n", - MmNumberOfSystemPtes, MmNumberOfSystemPtes * PAGE_SIZE); - - // - // Check if this is a machine with less than 256MB of RAM, and no overide - // - if ((MmNumberOfPhysicalPages <= MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING) && - !(MmSizeOfNonPagedPoolInBytes)) - { - // - // Force the non paged pool to be 2MB so we can reduce RAM usage - // - MmSizeOfNonPagedPoolInBytes = 2 * 1024 * 1024; - } - - // - // Check if the user gave a ridicuously large nonpaged pool RAM size - // - if ((MmSizeOfNonPagedPoolInBytes >> PAGE_SHIFT) > - (MmNumberOfPhysicalPages * 7 / 8)) - { - // - // More than 7/8ths of RAM was dedicated to nonpaged pool, ignore! - // - MmSizeOfNonPagedPoolInBytes = 0; - } - - // - // Check if no registry setting was set, or if the setting was too low - // - if (MmSizeOfNonPagedPoolInBytes < MmMinimumNonPagedPoolSize) - { - // - // Start with the minimum (256 KB) and add 32 KB for each MB above 4 - // - MmSizeOfNonPagedPoolInBytes = MmMinimumNonPagedPoolSize; - MmSizeOfNonPagedPoolInBytes += (MmNumberOfPhysicalPages - 1024) / - 256 * MmMinAdditionNonPagedPoolPerMb; - } - - // - // Check if the registy setting or our dynamic calculation was too high - // - if (MmSizeOfNonPagedPoolInBytes > MI_MAX_INIT_NONPAGED_POOL_SIZE) - { - // - // Set it to the maximum - // - MmSizeOfNonPagedPoolInBytes = MI_MAX_INIT_NONPAGED_POOL_SIZE; - } - - // - // Check if a percentage cap was set through the registry - // - if (MmMaximumNonPagedPoolPercent) - { - // - // Don't feel like supporting this right now - // - UNIMPLEMENTED; - } - - // - // Page-align the nonpaged pool size - // - MmSizeOfNonPagedPoolInBytes &= ~(PAGE_SIZE - 1); - - // - // Now, check if there was a registry size for the maximum size - // - if (!MmMaximumNonPagedPoolInBytes) - { - // - // Start with the default (1MB) and add 400 KB for each MB above 4 - // - MmMaximumNonPagedPoolInBytes = MmDefaultMaximumNonPagedPool; - MmMaximumNonPagedPoolInBytes += (MmNumberOfPhysicalPages - 1024) / - 256 * MmMaxAdditionNonPagedPoolPerMb; - } - - // - // Don't let the maximum go too high - // - if (MmMaximumNonPagedPoolInBytes > MI_MAX_NONPAGED_POOL_SIZE) - { - // - // Set it to the upper limit - // - MmMaximumNonPagedPoolInBytes = MI_MAX_NONPAGED_POOL_SIZE; - } - - // - // Calculate the number of bytes, and then convert to pages - // - MxPfnAllocation = (MmHighestPhysicalPage + 1) * sizeof(MMPFN); - MxPfnAllocation >>= PAGE_SHIFT; - - // - // Now calculate the nonpaged pool expansion VA region - // - MmNonPagedPoolStart = (PVOID)((ULONG_PTR)MmNonPagedPoolEnd - - MmMaximumNonPagedPoolInBytes + - MmSizeOfNonPagedPoolInBytes); - MmNonPagedPoolStart = (PVOID)PAGE_ALIGN(MmNonPagedPoolStart); - NonPagedPoolExpansionVa = MmNonPagedPoolStart; - DPRINT("NP Pool has been tuned to: %d bytes and %d bytes\n", - MmSizeOfNonPagedPoolInBytes, MmMaximumNonPagedPoolInBytes); - - // - // Now calculate the nonpaged system VA region, which includes the - // nonpaged pool expansion (above) and the system PTEs. Note that it is - // then aligned to a PDE boundary (4MB). - // - MmNonPagedSystemStart = (PVOID)((ULONG_PTR)MmNonPagedPoolStart - - (MmNumberOfSystemPtes + 1) * PAGE_SIZE); - MmNonPagedSystemStart = (PVOID)((ULONG_PTR)MmNonPagedSystemStart & - ~((4 * 1024 * 1024) - 1)); - - // - // Don't let it go below the minimum - // - if (MmNonPagedSystemStart < (PVOID)0xEB000000) - { - // - // This is a hard-coded limit in the Windows NT address space - // - MmNonPagedSystemStart = (PVOID)0xEB000000; - - // - // Reduce the amount of system PTEs to reach this point - // - MmNumberOfSystemPtes = ((ULONG_PTR)MmNonPagedPoolStart - - (ULONG_PTR)MmNonPagedSystemStart) >> - PAGE_SHIFT; - MmNumberOfSystemPtes--; - ASSERT(MmNumberOfSystemPtes > 1000); - } - - // - // Normally, the PFN database should start after the loader images. - // This is already the case in ReactOS, but for now we want to co-exist - // with the old memory manager, so we'll create a "Shadow PFN Database" - // instead, and arbitrarly start it at 0xB0000000. - // - MmArmPfnDatabase = (PVOID)0xB0000000; - ASSERT(((ULONG_PTR)MmArmPfnDatabase & ((4 * 1024 * 1024) - 1)) == 0); - - // - // Non paged pool comes after the PFN database - // - MmNonPagedPoolStart = (PVOID)((ULONG_PTR)MmArmPfnDatabase + - (MxPfnAllocation << PAGE_SHIFT)); - - // - // Now we actually need to get these many physical pages. Nonpaged pool - // is actually also physically contiguous (but not the expansion) - // - PageFrameIndex = MmGetContinuousPages(MmSizeOfNonPagedPoolInBytes + - (MxPfnAllocation << PAGE_SHIFT), - Low, - High, - BoundaryAddressMultiple, - FALSE); - ASSERT(PageFrameIndex != 0); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmArmPfnDatabase, - (ULONG_PTR)MmArmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT), - "Shadow PFN Database"); - DPRINT("PFN DB PA PFN begins at: %lx\n", PageFrameIndex); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmNonPagedPoolStart, - (ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes, - "ARM Non Paged Pool"); - DPRINT("NP PA PFN begins at: %lx\n", PageFrameIndex + MxPfnAllocation); - - // - // Now we need some pages to create the page tables for the NP system VA - // which includes system PTEs and expansion NP - // - StartPde = MiAddressToPde(MmNonPagedSystemStart); - EndPde = MiAddressToPde((PVOID)((ULONG_PTR)MmNonPagedPoolEnd - 1)); - while (StartPde <= EndPde) - { - // - // Sanity check - // - ASSERT(StartPde->u.Hard.Valid == 0); - - // - // Get a page - // - TempPde.u.Hard.PageFrameNumber = MmAllocPage(MC_SYSTEM, 0); - ASSERT(TempPde.u.Hard.Valid == 1); - *StartPde = TempPde; - - // - // Zero out the page table - // - PointerPte = MiPteToAddress(StartPde); - RtlZeroMemory(PointerPte, PAGE_SIZE); - - // - // Next - // - StartPde++; - } - - // - // Now we need pages for the page tables which will map initial NP - // - StartPde = MiAddressToPde(MmArmPfnDatabase); - EndPde = MiAddressToPde((PVOID)((ULONG_PTR)MmNonPagedPoolStart + - MmSizeOfNonPagedPoolInBytes - 1)); - while (StartPde <= EndPde) - { - // - // Sanity check - // - ASSERT(StartPde->u.Hard.Valid == 0); - - // - // Get a page - // - TempPde.u.Hard.PageFrameNumber = MmAllocPage(MC_SYSTEM, 0); - ASSERT(TempPde.u.Hard.Valid == 1); - *StartPde = TempPde; - - // - // Zero out the page table - // - PointerPte = MiPteToAddress(StartPde); - RtlZeroMemory(PointerPte, PAGE_SIZE); - - // - // Next - // - StartPde++; - } - - // - // Now remember where the expansion starts - // - MmNonPagedPoolExpansionStart = NonPagedPoolExpansionVa; - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmNonPagedSystemStart, MmNonPagedPoolExpansionStart, - "System PTE Space"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmNonPagedPoolExpansionStart, MmNonPagedPoolEnd, - "Non Paged Pool Expansion PTE Space"); - - // - // Last step is to actually map the nonpaged pool - // - PointerPte = MiAddressToPte(MmNonPagedPoolStart); - LastPte = MiAddressToPte((PVOID)((ULONG_PTR)MmNonPagedPoolStart + - MmSizeOfNonPagedPoolInBytes - 1)); - while (PointerPte <= LastPte) - { - // - // Use one of our contigous pages - // - TempPte.u.Hard.PageFrameNumber = PageFrameIndex++; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte++ = TempPte; - } - - // - // ReactOS requires a memory area to keep the initial NP area off-bounds - // - BaseAddress = MmNonPagedPoolStart; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM | MEMORY_AREA_STATIC, - &BaseAddress, - MmSizeOfNonPagedPoolInBytes, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - ASSERT(Status == STATUS_SUCCESS); - - // - // And we need one more for the system NP - // - BaseAddress = MmNonPagedSystemStart; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM | MEMORY_AREA_STATIC, - &BaseAddress, - (ULONG_PTR)MmNonPagedPoolEnd - - (ULONG_PTR)MmNonPagedSystemStart, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - ASSERT(Status == STATUS_SUCCESS); - - // - // Sanity check: make sure we have properly defined the system PTE space - // - ASSERT(MiAddressToPte(MmNonPagedSystemStart) < - MiAddressToPte(MmNonPagedPoolExpansionStart)); - - // - // Now go ahead and initialize the ARM pool - // - MiInitializeArmPool(); - - // - // We PDE-aligned the nonpaged system start VA, so haul some extra PTEs! - // - PointerPte = MiAddressToPte(MmNonPagedSystemStart); - OldCount = MmNumberOfSystemPtes; - MmNumberOfSystemPtes = MiAddressToPte(MmNonPagedPoolExpansionStart) - - PointerPte; - MmNumberOfSystemPtes--; - DPRINT("Final System PTE count: %d (%d bytes)\n", - MmNumberOfSystemPtes, MmNumberOfSystemPtes * PAGE_SIZE); - - // - // Create the system PTE space - // - MiInitializeSystemPtes(PointerPte, MmNumberOfSystemPtes, SystemPteSpace); - - // - // Get the PDE For hyperspace - // - StartPde = MiAddressToPde(HYPER_SPACE); - - // - // Allocate a page for it and create it - // - PageFrameIndex = MmAllocPage(MC_SYSTEM, 0); - TempPde.u.Hard.PageFrameNumber = PageFrameIndex; - TempPde.u.Hard.Global = FALSE; // Hyperspace is local! - ASSERT(StartPde->u.Hard.Valid == 0); - ASSERT(TempPde.u.Hard.Valid == 1); - *StartPde = TempPde; - - // - // Zero out the page table now - // - PointerPte = MiAddressToPte(HYPER_SPACE); - RtlZeroMemory(PointerPte, PAGE_SIZE); - - // - // Setup the mapping PTEs - // - MmFirstReservedMappingPte = MiAddressToPte(MI_MAPPING_RANGE_START); - MmLastReservedMappingPte = MiAddressToPte(MI_MAPPING_RANGE_END); - MmFirstReservedMappingPte->u.Hard.PageFrameNumber = MI_HYPERSPACE_PTES; - - // - // Reserve system PTEs for zeroing PTEs and clear them - // - MiFirstReservedZeroingPte = MiReserveSystemPtes(MI_ZERO_PTES, - SystemPteSpace); - RtlZeroMemory(MiFirstReservedZeroingPte, MI_ZERO_PTES * sizeof(MMPTE)); - - // - // Set the counter to maximum to boot with - // - MiFirstReservedZeroingPte->u.Hard.PageFrameNumber = MI_ZERO_PTES - 1; - - // - // Sync us up with ReactOS Mm - // - MiSyncARM3WithROS(MmNonPagedSystemStart, (PVOID)((ULONG_PTR)MmNonPagedPoolEnd - 1)); - MiSyncARM3WithROS(MmArmPfnDatabase, (PVOID)((ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes - 1)); - MiSyncARM3WithROS((PVOID)HYPER_SPACE, (PVOID)(HYPER_SPACE + PAGE_SIZE - 1)); - - // - // Initialize the nonpaged pool - // - InitializePool(NonPagedPool, 0); - - // - // Do a little test of the nonpaged pool allocator - // - if (0) - { - ULONG i = 0; - PVOID Buffers[4096]; - while (TRUE) - { - Buffers[i] = MiAllocatePoolPages(NonPagedPool, PAGE_SIZE); - if (!Buffers[i]) break; - if (i == 4096) break; - i++; - } - - while (i--) - { - MiFreePoolPages(Buffers[i]); - } - } - } - else - { - // - // Instantiate memory that we don't consider RAM/usable - // We use the same exclusions that Windows does, in order to try to be - // compatible with WinLDR-style booting - // - for (i = 0; i < LoaderMaximum; i++) IncludeType[i] = TRUE; - IncludeType[LoaderBad] = FALSE; - IncludeType[LoaderFirmwarePermanent] = FALSE; - IncludeType[LoaderSpecialMemory] = FALSE; - IncludeType[LoaderBBTMemory] = FALSE; - - // - // Build the physical memory block - // - MmPhysicalMemoryBlock = MmInitializeMemoryLimits(LoaderBlock, - IncludeType); - for (i = 0; i < MmPhysicalMemoryBlock->NumberOfRuns; i++) - { - // - // Dump it for debugging - // - PPHYSICAL_MEMORY_RUN Run; - Run = &MmPhysicalMemoryBlock->Run[i]; - DPRINT("PHYSICAL RAM [0x%08p to 0x%08p]\n", - Run->BasePage << PAGE_SHIFT, - (Run->BasePage + Run->PageCount) << PAGE_SHIFT); - } - } - - // - // Always return success for now - // - return STATUS_SUCCESS; -} - -/* EOF */ Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Wed Jul 15 19:55:13 2009 @@ -360,12 +360,21 @@ </directory> </if> <directory name="ARM3"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>init.c</file> + </directory> + </if> + <if property="ARCH" value="arm"> + <directory name="arm"> + <file>init.c</file> + </directory> + </if> <file>contmem.c</file> <file>drvmgmt.c</file> <file>dynamic.c</file> <file>expool.c</file> <file>hypermap.c</file> - <file>init.c</file> <file>iosup.c</file> <file>mdlsup.c</file> <file>ncache.c</file>

1 0

[ros-arm-bringup] 41979: - Use the new portable flag definitions.
by ros-arm-bringup＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: ros-arm-bringup Date: Wed Jul 15 19:53:45 2009 New Revision: 41979 URL: http://svn.reactos.org/svn/reactos?rev=41979&view=rev Log: - Use the new portable flag definitions. Modified: trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c trunk/reactos/ntoskrnl/mm/ARM3/iosup.c trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c trunk/reactos/ntoskrnl/mm/ARM3/ncache.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/syspte.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/hypermap.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c [iso-8859-1] Wed Jul 15 19:53:45 2009 @@ -46,7 +46,7 @@ // TempPte = HyperTemplatePte; TempPte.u.Hard.PageFrameNumber = Page; - TempPte.u.Hard.Global = 0; // Hyperspace is local! + MI_MAKE_LOCAL_PAGE(&TempPte); // Hyperspace is local! // // Pick the first hyperspace PTE @@ -157,7 +157,7 @@ // PointerPte += (Offset + 1); TempPte = HyperTemplatePte; - TempPte.u.Hard.Global = FALSE; // Hyperspace is local! + MI_MAKE_LOCAL_PAGE(&TempPte); // Hyperspace is local! do { // Modified: trunk/reactos/ntoskrnl/mm/ARM3/iosup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/iosup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] Wed Jul 15 19:53:45 2009 @@ -115,8 +115,8 @@ // // Disable the cache // - TempPte.u.Hard.CacheDisable = 1; - TempPte.u.Hard.WriteThrough = 1; + MI_PAGE_DISABLE_CACHE(&TempPte); + MI_PAGE_WRITE_THROUGH(&TempPte); break; case MiCached: Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Wed Jul 15 19:53:45 2009 @@ -369,8 +369,8 @@ // // Disable caching // - TempPte.u.Hard.CacheDisable = 1; - TempPte.u.Hard.WriteThrough = 1; + MI_PAGE_DISABLE_CACHE(&TempPte); + MI_PAGE_WRITE_THROUGH(&TempPte); break; case MiWriteCombined: @@ -378,8 +378,8 @@ // // Enable write combining // - TempPte.u.Hard.CacheDisable = 1; - TempPte.u.Hard.WriteThrough = 0; + MI_PAGE_DISABLE_CACHE(&TempPte); + MI_PAGE_WRITE_COMBINED(&TempPte); break; default: @@ -856,12 +856,12 @@ // // Check if the PTE is not writable // - if (!PointerPte->u.Hard.Write) + if (MI_IS_PAGE_WRITEABLE(PointerPte) == FALSE) { // // Check if it's copy on write // - if (PointerPte->u.Hard.CopyOnWrite) + if (MI_IS_PAGE_COPY_ON_WRITE(PointerPte)) { // // Get the base address and allow a change for user-mode Modified: trunk/reactos/ntoskrnl/mm/ARM3/ncache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/ncache.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] Wed Jul 15 19:53:45 2009 @@ -120,8 +120,8 @@ // // Disable caching // - TempPte.u.Hard.CacheDisable = 1; - TempPte.u.Hard.WriteThrough = 1; + MI_PAGE_DISABLE_CACHE(&TempPte); + MI_PAGE_WRITE_THROUGH(&TempPte); break; case MiWriteCombined: @@ -129,8 +129,8 @@ // // Enable write combining // - TempPte.u.Hard.CacheDisable = 1; - TempPte.u.Hard.WriteThrough = 0; + MI_PAGE_DISABLE_CACHE(&TempPte); + MI_PAGE_WRITE_COMBINED(&TempPte); break; default: Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Wed Jul 15 19:53:45 2009 @@ -128,9 +128,9 @@ // Setup the template stack PTE // TempPte = HyperTemplatePte; - TempPte.u.Hard.Global = FALSE; + MI_MAKE_LOCAL_PAGE(&TempPte); + MI_MAKE_DIRTY_PAGE(&TempPte); TempPte.u.Hard.PageFrameNumber = 0; - TempPte.u.Hard.Dirty = TRUE; // // Acquire the PFN DB lock @@ -225,9 +225,9 @@ // Setup the template stack PTE // TempPte = HyperTemplatePte; - TempPte.u.Hard.Global = FALSE; + MI_MAKE_LOCAL_PAGE(&TempPte); + MI_MAKE_DIRTY_PAGE(&TempPte); TempPte.u.Hard.PageFrameNumber = 0; - TempPte.u.Hard.Dirty = TRUE; // // Acquire the PFN DB lock Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/syspte.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] Wed Jul 15 19:53:45 2009 @@ -364,7 +364,7 @@ // // Set the starting and ending PTE addresses for this space // - MmSystemPteBase = (PVOID)PAGETABLE_MAP; + MmSystemPteBase = (PVOID)PTE_BASE; MmSystemPtesStart[PoolType] = StartingPte; MmSystemPtesEnd[PoolType] = StartingPte + NumberOfPtes - 1; DPRINT("System PTE space for %d starting at: %p and ending at: %p\n",

1 0

[ros-arm-bringup] 41978: - Define portable flags for touching fields in the MMPTE structure, which might have different names/not exist on other architectures. - Define PTE_BASE and PDE_BASE since these are the correct cross-platform definitions.
by ros-arm-bringup＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: ros-arm-bringup Date: Wed Jul 15 19:52:32 2009 New Revision: 41978 URL: http://svn.reactos.org/svn/reactos?rev=41978&view=rev Log: - Define portable flags for touching fields in the MMPTE structure, which might have different names/not exist on other architectures. - Define PTE_BASE and PDE_BASE since these are the correct cross-platform definitions. Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Wed Jul 15 19:52:32 2009 @@ -14,7 +14,10 @@ /* Base addresses of PTE and PDE */ #define PAGETABLE_MAP (0xc0000000) #define PAGEDIRECTORY_MAP (0xc0000000 + (PAGETABLE_MAP / (1024))) -#define HYPER_SPACE (0xC0400000) + +#define PTE_BASE 0xC0000000 +#define PDE_BASE 0xC0300000 +#define HYPER_SPACE 0xC0400000 /* Converting address to a corresponding PDE or PTE entry */ #define MiAddressToPde(x) \ @@ -36,4 +39,13 @@ /* Easy accessing PFN in PTE */ #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) +#define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.Global = 0) +#define MI_MAKE_DIRTY_PAGE(x) ((x)->u.Hard.Dirty = 1) +#define MI_PAGE_DISABLE_CACHE(x) ((x)->u.Hard.CacheDisable = 1) +#define MI_PAGE_WRITE_THROUGH(x) ((x)->u.Hard.WriteThrough = 1) +#define MI_PAGE_WRITE_COMBINED(x) ((x)->u.Hard.WriteThrough = 0) +#define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.Write == 1) +#define MI_IS_PAGE_COPY_ON_WRITE(x)((x)->u.Hard.CopyOnWrite == 1) +#define MI_IS_PAGE_DIRTY(x) ((x)->u.Hard.Dirty == 1) + #endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H */

1 0

[ros-arm-bringup] 41977: - Don't use "static" in the kernel. - Also prevents from getting a warning on ARM and other platforms that don't do PSEH2 since they have native exception support.
by ros-arm-bringup＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: ros-arm-bringup Date: Wed Jul 15 19:50:50 2009 New Revision: 41977 URL: http://svn.reactos.org/svn/reactos?rev=41977&view=rev Log: - Don't use "static" in the kernel. - Also prevents from getting a warning on ARM and other platforms that don't do PSEH2 since they have native exception support. Modified: trunk/reactos/ntoskrnl/mm/virtual.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Wed Jul 15 19:50:50 2009 @@ -20,8 +20,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static -int +LONG MiGetExceptionInfo(EXCEPTION_POINTERS *ExceptionInfo, BOOLEAN * HaveBadAddress, ULONG_PTR * BadAddress) { PEXCEPTION_RECORD ExceptionRecord; Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] Wed Jul 15 19:50:50 2009 @@ -113,8 +113,7 @@ } } -static -int +LONG PspUnhandledExceptionInSystemThread(PEXCEPTION_POINTERS ExceptionPointers) { /* Print debugging information */

1 0

[ros-arm-bringup] 41976: - Remove FreeLDR linker hack on ARM.
by ros-arm-bringup＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: ros-arm-bringup Date: Wed Jul 15 19:49:38 2009 New Revision: 41976 URL: http://svn.reactos.org/svn/reactos?rev=41976&view=rev Log: - Remove FreeLDR linker hack on ARM. Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Wed Jul 15 19:49:38 2009 @@ -2806,7 +2806,7 @@ if (Environment::GetArch() == "arm") { fprintf ( fMakefile, - "\t${gcc} -Wl,--subsystem,native -Wl,--section-start,startup=0x8000 -o %s %s %s %s\n", + "\t${gcc} -Wl,--subsystem,native -o %s %s %s %s\n", backend->GetFullName ( junk_tmp ).c_str (), objectsMacro.c_str (), libsMacro.c_str (),

1 0

[ros-arm-bringup] 41975: - Hackfix floating point call in rtl's printf until the compiler guys get their shit together.
by ros-arm-bringup＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: ros-arm-bringup Date: Wed Jul 15 19:49:05 2009 New Revision: 41975 URL: http://svn.reactos.org/svn/reactos?rev=41975&view=rev Log: - Hackfix floating point call in rtl's printf until the compiler guys get their shit together. Modified: trunk/reactos/lib/rtl/sprintf.c trunk/reactos/lib/rtl/swprintf.c Modified: trunk/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sprintf.c?rev=4197… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sprintf.c [iso-8859-1] Wed Jul 15 19:49:05 2009 @@ -226,7 +226,9 @@ { x = num; tmp[i++] = digits[do_div(&x,base)]; +#ifndef _M_ARM // Missing __floatdidf in CeGCC 0.55 -- GCC 4.4 num=x; +#endif } if (i > precision) precision = i; Modified: trunk/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/swprintf.c?rev=419… ============================================================================== --- trunk/reactos/lib/rtl/swprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/swprintf.c [iso-8859-1] Wed Jul 15 19:49:05 2009 @@ -226,7 +226,9 @@ { x = num; tmp[i++] = digits[do_div(&x,base)]; +#ifndef _M_ARM // Missing __floatdidf in CeGCC 0.55 -- GCC 4.4 num = x; +#endif } if (i > precision) precision = i;

1 0

[ros-arm-bringup] 41974: - Make platform specific directory to please the ARM folks.
by ros-arm-bringup＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: ros-arm-bringup Date: Wed Jul 15 19:28:23 2009 New Revision: 41974 URL: http://svn.reactos.org/svn/reactos?rev=41974&view=rev Log: - Make platform specific directory to please the ARM folks. Added: trunk/reactos/ntoskrnl/mm/ARM3/arm/ trunk/reactos/ntoskrnl/mm/ARM3/i386/

1 0

[sginsberg] 41973: - Remove the object body zeroing hack from ObpAllocateObject now that callers that relied on this have been fixed. Fixes ~4000 unnecessary buffer zeroing operations just for boot!
by sginsberg＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: sginsberg Date: Wed Jul 15 18:52:47 2009 New Revision: 41973 URL: http://svn.reactos.org/svn/reactos?rev=41973&view=rev Log: - Remove the object body zeroing hack from ObpAllocateObject now that callers that relied on this have been fixed. Fixes ~4000 unnecessary buffer zeroing operations just for boot! Modified: trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Wed Jul 15 18:52:47 2009 @@ -829,9 +829,6 @@ HighWaterNumberOfObjects); } - /* OMG-Hack-Of-Doom */ - RtlZeroMemory(&Header->Body, ObjectSize); - /* Return Header */ *ObjectHeader = Header; return STATUS_SUCCESS;

1 0

[sginsberg] 41972: - Don't assume the object body allocated by ObCreateObject (through ObpAllocateObject) is zero-initialized (it shouldn't be).
by sginsberg＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: sginsberg Date: Wed Jul 15 18:13:08 2009 New Revision: 41972 URL: http://svn.reactos.org/svn/reactos?rev=41972&view=rev Log: - Don't assume the object body allocated by ObCreateObject (through ObpAllocateObject) is zero-initialized (it shouldn't be). Modified: trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/se/token.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Jul 15 18:13:08 2009 @@ -2375,6 +2375,8 @@ /* * Initialize it */ + Section->Type = 0; + Section->Size = 0; Section->SectionPageProtection = SectionPageProtection; Section->AllocationAttributes = AllocationAttributes; Section->Segment = NULL; @@ -2447,6 +2449,8 @@ /* * Initialize it */ + Section->Type = 0; + Section->Size = 0; Section->SectionPageProtection = SectionPageProtection; Section->AllocationAttributes = AllocationAttributes; Section->Segment = NULL; @@ -3373,6 +3377,9 @@ /* * Initialize it */ + Section->Type = 0; + Section->Size = 0; + Section->MaximumSize.QuadPart = 0; Section->SectionPageProtection = SectionPageProtection; Section->AllocationAttributes = AllocationAttributes; Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Wed Jul 15 18:13:08 2009 @@ -247,7 +247,10 @@ DPRINT1("ObCreateObject() failed (Status %lx)\n"); return(Status); } - + + /* Zero out the buffer */ + RtlZeroMemory(AccessToken, sizeof(TOKEN)); + Status = ZwAllocateLocallyUniqueId(&AccessToken->TokenId); if (!NT_SUCCESS(Status)) { @@ -264,7 +267,6 @@ AccessToken->TokenLock = &SepTokenLock; - AccessToken->TokenInUse = 0; AccessToken->TokenType = TokenType; AccessToken->ImpersonationLevel = Level; RtlCopyLuid(&AccessToken->AuthenticationId, &Token->AuthenticationId); @@ -331,10 +333,6 @@ memcpy(AccessToken->DefaultDacl, Token->DefaultDacl, Token->DefaultDacl->AclSize); - } - else - { - AccessToken->DefaultDacl = 0; } } @@ -549,6 +547,9 @@ { return NULL; } + + /* Zero out the buffer */ + RtlZeroMemory(AccessToken, sizeof(TOKEN)); Status = ExpAllocateLocallyUniqueId(&AccessToken->TokenId); if (!NT_SUCCESS(Status)) @@ -575,8 +576,6 @@ AccessToken->TokenType = TokenPrimary; AccessToken->ImpersonationLevel = SecurityDelegation; - AccessToken->TokenSource.SourceIdentifier.LowPart = 0; - AccessToken->TokenSource.SourceIdentifier.HighPart = 0; memcpy(AccessToken->TokenSource.SourceName, "SeMgr\0\0\0", 8); AccessToken->ExpirationTime.QuadPart = -1; AccessToken->UserAndGroupCount = 4; @@ -2042,6 +2041,9 @@ DPRINT1("ObCreateObject() failed (Status %lx)\n"); return(Status); } + + /* Zero out the buffer */ + RtlZeroMemory(AccessToken, sizeof(TOKEN)); AccessToken->TokenLock = &SepTokenLock; @@ -2058,8 +2060,6 @@ AccessToken->UserAndGroupCount = TokenGroups->GroupCount + 1; AccessToken->PrivilegeCount = TokenPrivileges->PrivilegeCount; - AccessToken->UserAndGroups = 0; - AccessToken->Privileges = 0; AccessToken->TokenType = TokenType; AccessToken->ImpersonationLevel = ((PSECURITY_QUALITY_OF_SERVICE) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Wed Jul 15 18:13:08 2009 @@ -142,6 +142,7 @@ if (!NT_SUCCESS(Status)) return Status; /* Initialize shell hook window list and set the parent */ + RtlZeroMemory(Desktop, sizeof(DESKTOP)); InitializeListHead(&Desktop->ShellHookWindows); Desktop->WindowStation = (PWINSTATION_OBJECT)ParseObject; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Wed Jul 15 18:13:08 2009 @@ -482,6 +482,9 @@ SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); return 0; } + + /* Zero out the buffer */ + RtlZeroMemory(WindowStationObject, sizeof(WINSTATION_OBJECT)); KeInitializeSpinLock(&WindowStationObject->Lock);

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2009