ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-01 19:26:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deal with the fact that DirectoryTableBase in EPROCESS has now been defined as PULONG instead of LARGE_INTEGER

Browse Source 
Remove ARM-specific hyperspace functions since these are portable now

svn path=/trunk/; revision=41926
This commit is contained in:
ReactOS Portable Systems Group
2009-07-12 10:47:45 +00:00
parent 0a25cb7cf3
commit 7653420856
3 changed files with 10 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/ntoskrnl/ke/arm/kiinit.c
+2 -3
View File
@@ -42,7 +42,7 @@ KiInitializeKernel(IN PKPROCESS InitProcess,
IN CCHAR Number,
IN PLOADER_PARAMETER_BLOCK LoaderBlock)
{
LARGE_INTEGER PageDirectory;
ULONG PageDirectory[2];
PKPCR Pcr;
ULONG i;
@@ -200,11 +200,10 @@ KiInitializeKernel(IN PKPROCESS InitProcess,
// Initialize the Idle Process and the Process Listhead
//
InitializeListHead(&KiProcessListHead);
PageDirectory.QuadPart = 0;
KeInitializeProcess(InitProcess,
0,
0xFFFFFFFF,
&PageDirectory,
PageDirectory,
FALSE);
InitProcess->QuantumReset = MAXCHAR;
}
reactos/ntoskrnl/ke/arm/trapc.c
+3 -3
View File
@@ -100,7 +100,7 @@ KiSwapProcess(IN PKPROCESS NewProcess,
//
// Update the page directory base
//
TtbRegister.AsUlong = (ULONG)NewProcess->DirectoryTableBase.LowPart;
TtbRegister.AsUlong = NewProcess->DirectoryTableBase[0];
ASSERT(TtbRegister.Reserved == 0);
KeArmTranslationTableRegisterSet(TtbRegister);
@@ -148,8 +148,8 @@ KiSwapContextInternal(IN PKTHREAD OldThread,
//
// Check if address space switch is needed
//
if (OldProcess->DirectoryTableBase.LowPart !=
NewProcess->DirectoryTableBase.LowPart)
if (OldProcess->DirectoryTableBase[0] !=
NewProcess->DirectoryTableBase[0])
{
//
// FIXME-USER: Support address space switch
reactos/ntoskrnl/mm/arm/stubs.c
+5 -91
View File
@@ -290,7 +290,7 @@ BOOLEAN
NTAPI
MmCreateProcessAddressSpace(IN ULONG MinWs,
IN PEPROCESS Process,
IN PLARGE_INTEGER DirectoryTableBase)
IN PULONG DirectoryTableBase)
{
NTSTATUS Status;
ULONG i;
@@ -360,7 +360,7 @@ MmCreateProcessAddressSpace(IN ULONG MinWs,
//
// Return the page table base
//
DirectoryTableBase->QuadPart = Pfn[0] << PAGE_SHIFT;
DirectoryTableBase[0] = Pfn[0] << PAGE_SHIFT;
return TRUE;
}
@@ -391,12 +391,13 @@ Mmi386ReleaseMmInfo(IN PEPROCESS Process)
NTSTATUS
NTAPI
MmInitializeHandBuiltProcess(IN PEPROCESS Process,
IN PLARGE_INTEGER DirectoryTableBase)
IN PULONG DirectoryTableBase)
{
//
// Share the directory base with the idle process
//
*DirectoryTableBase = PsGetCurrentProcess()->Pcb.DirectoryTableBase;
DirectoryTableBase[0] = PsGetCurrentProcess()->Pcb.DirectoryTableBase[0];
DirectoryTableBase[1] = PsGetCurrentProcess()->Pcb.DirectoryTableBase[1];
//
// Initialize the Addresss Space
@@ -687,93 +688,6 @@ MmDeleteVirtualMapping(IN PEPROCESS Process,
if (Page) *Page = Pfn;
}
PVOID
NTAPI
MmCreateHyperspaceMapping(IN PFN_TYPE Page)
{
PMMPTE PointerPte, FirstPte, LastPte;
MMPTE TempPte;
PVOID Address;
//
// Loop hyperspace PTEs (1MB)
//
FirstPte = PointerPte = MiGetPteAddress((PVOID)HYPER_SPACE);
LastPte = PointerPte + 256;
while (PointerPte <= LastPte)
{
//
// Find a free slot
//
if (PointerPte->u.Hard.L2.Fault.Type == FaultPte)
{
//
// Use this entry
//
break;
}
//
// Try the next one
//
PointerPte++;
}
//
// Check if we didn't find anything
//
if (PointerPte > LastPte) return NULL;
//
// Create the mapping
//
TempPte = MiArmTemplatePte;
TempPte.u.Hard.L2.Small.BaseAddress = Page;
ASSERT(PointerPte->u.Hard.L2.Fault.Type == FaultPte);
ASSERT(TempPte.u.Hard.L2.Small.Type == SmallPte);
*PointerPte = TempPte;
//
// Return the address
//
Address = (PVOID)(HYPER_SPACE + ((PointerPte - FirstPte) * PAGE_SIZE));
KeArmInvalidateTlbEntry(Address);
DPRINT("[HMAP]: %p %lx\n", Address, Page);
return Address;
}
PFN_TYPE
NTAPI
MmDeleteHyperspaceMapping(IN PVOID Address)
{
PFN_TYPE Pfn;
PMMPTE PointerPte;
DPRINT("[HUNMAP]: %p\n", Address);
//
// Get the PTE
//
PointerPte = MiGetPteAddress(Address);
ASSERT(PointerPte->u.Hard.L2.Small.Type == SmallPte);
//
// Save the PFN
//
Pfn = PointerPte->u.Hard.L2.Small.BaseAddress;
//
// Destroy the PTE
//
PointerPte->u.Hard.AsUlong = 0;
ASSERT(PointerPte->u.Hard.L2.Fault.Type == FaultPte);
//
// Flush the TLB entry and return the PFN
//
KeArmInvalidateTlbEntry(Address);
return Pfn;
}
VOID
NTAPI
MmDeletePageFileMapping(IN PEPROCESS Process,