Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 05:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Removed some hard coded values, which depend on a kernel base of 0xc0000000.

Browse source 
svn path=/trunk/; revision=11202
This commit is contained in:
Hartmut Birr 2004-10-05 18:53:28 +00:00
parent 306d451c3b
commit 3fdd7a717c
2 changed files with 68 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

8
reactos/ntoskrnl/ke/i386/multiboot.S
View file

@ -4,10 +4,6 @@
#include <internal/ps.h> #include <internal/ps.h>
#include <internal/i386/mm.h> #include <internal/i386/mm.h>
/* FIXME: These should be calculated from Command Line */
#define KERNEL_PD_START (KERNEL_BASE / 0x100000) /* Page Directory Start. Only the High 3 bits. */
#define KERNEL_PD_END ((KERNEL_BASE + 0x00400000) / 0x100000) /* Page Directory End. Only the High 3 bits. */
#define MULTIBOOT_HEADER_MAGIC (0x1BADB002) #define MULTIBOOT_HEADER_MAGIC (0x1BADB002)
#define MULTIBOOT_HEADER_FLAGS (0x00010003) #define MULTIBOOT_HEADER_FLAGS (0x00010003)
@ -112,8 +108,8 @@ _multiboot_entry:
*/ */
movl $V2P(startup_pagedirectory), %esi movl $V2P(startup_pagedirectory), %esi
movl $(V2P(lowmem_pagetable) + 0x3), 0x0(%esi) movl $(V2P(lowmem_pagetable) + 0x3), 0x0(%esi)
movl $(V2P(kernel_pagetable) + 0x3), 0xC00(%esi) movl $(V2P(kernel_pagetable) + 0x3), (KERNEL_BASE >> 20)(%esi)
movl $(V2P(kernel_pagetable+4096) + 0x3), 0xC04(%esi) movl $(V2P(kernel_pagetable+4096) + 0x3), ((KERNEL_BASE >> 20) + 4)(%esi)
movl $(V2P(startup_pagedirectory) + 0x3), 0xF00(%esi) movl $(V2P(startup_pagedirectory) + 0x3), 0xF00(%esi)
movl $(V2P(kernelmap_pagetable) + 0x3), 0xF0C(%esi) movl $(V2P(kernelmap_pagetable) + 0x3), 0xF0C(%esi)

71
reactos/ntoskrnl/mm/i386/page.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: page.c,v 1.74 2004/09/26 16:32:17 hbirr Exp $ /* $Id: page.c,v 1.75 2004/10/05 18:53:28 hbirr Exp $
* *
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
* FILE: ntoskrnl/mm/i386/page.c * FILE: ntoskrnl/mm/i386/page.c
@ -58,7 +58,7 @@
#define PAE_PAGEDIRECTORY_MAP (0xf0000000 + (PAGETABLE_MAP / (512))) #define PAE_PAGEDIRECTORY_MAP (0xf0000000 + (PAGETABLE_MAP / (512)))
ULONG MmGlobalKernelPageDirectory[1024]; ULONG MmGlobalKernelPageDirectory[1024];
ULONGLONG MmGlobalKernelPageDirectoryForPAE[512]; ULONGLONG MmGlobalKernelPageDirectoryForPAE[2048];
#define PTE_TO_PFN(X) ((X) >> PAGE_SHIFT) #define PTE_TO_PFN(X) ((X) >> PAGE_SHIFT)
#define PFN_TO_PTE(X) ((X) << PAGE_SHIFT) #define PFN_TO_PTE(X) ((X) << PAGE_SHIFT)
@ -158,7 +158,9 @@ ProtectToPTE(ULONG flProtect)
#define PAE_ADDR_TO_PDTE_OFFSET(v) (((ULONG_PTR)(v)) / (512 * 512 * PAGE_SIZE)) #define PAE_ADDR_TO_PDTE_OFFSET(v) (((ULONG_PTR)(v)) / (512 * 512 * PAGE_SIZE))
#define PAE_ADDR_TO_PDE_OFFSET(v) ((((ULONG_PTR)(v)) % (512 * 512 * PAGE_SIZE)) / (512 * PAGE_SIZE)) #define PAE_ADDR_TO_PDE_PAGE_OFFSET(v) ((((ULONG_PTR)(v)) % (512 * 512 * PAGE_SIZE)) / (512 * PAGE_SIZE))
#define PAE_ADDR_TO_PDE_OFFSET(v) (((ULONG_PTR)(v))/ (512 * PAGE_SIZE))
#define PAE_ADDR_TO_PTE_OFFSET(v) ((((ULONG_PTR)(v)) % (512 * PAGE_SIZE)) / PAGE_SIZE) #define PAE_ADDR_TO_PTE_OFFSET(v) ((((ULONG_PTR)(v)) % (512 * PAGE_SIZE)) / PAGE_SIZE)
@ -193,7 +195,7 @@ NTSTATUS Mmi386ReleaseMmInfo(PEPROCESS Process)
PageDirTable = (PULONGLONG)ExAllocatePageWithPhysPage(Process->Pcb.DirectoryTableBase.QuadPart >> PAGE_SHIFT); PageDirTable = (PULONGLONG)ExAllocatePageWithPhysPage(Process->Pcb.DirectoryTableBase.QuadPart >> PAGE_SHIFT);
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
if (i < 3) if (i < PAE_ADDR_TO_PDTE_OFFSET(KERNEL_BASE))
{ {
PageDir = (PULONGLONG)ExAllocatePageWithPhysPage(PageDirTable[i] >> PAGE_SHIFT); PageDir = (PULONGLONG)ExAllocatePageWithPhysPage(PageDirTable[i] >> PAGE_SHIFT);
for (j = 0; j < 512; j++) for (j = 0; j < 512; j++)
@ -318,24 +320,30 @@ NTSTATUS MmCopyMmInfo(PEPROCESS Src, PEPROCESS Dest)
PageDirTable[i] = (Pfn[i] << PAGE_SHIFT) | PA_PRESENT; PageDirTable[i] = (Pfn[i] << PAGE_SHIFT) | PA_PRESENT;
} }
ExUnmapPage(PageDirTable); ExUnmapPage(PageDirTable);
PageDir = (PULONGLONG)ExAllocatePageWithPhysPage(Pfn[3]); for (i = PAE_ADDR_TO_PDTE_OFFSET(KERNEL_BASE); i < 4; i++)
{
PageDir = (PULONGLONG)ExAllocatePageWithPhysPage(Pfn[i]);
if (PageDir == NULL) if (PageDir == NULL)
{ {
for (i = 0; i < 4; i++) for (j = 0; j < 4; j++)
{ {
MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn[i]); MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn[j]);
} }
ExUnmapPage(PageDirTable); ExUnmapPage(PageDirTable);
MmReleasePageMemoryConsumer(MC_NPPOOL, PhysPageDirectory.QuadPart >> PAGE_SHIFT); MmReleasePageMemoryConsumer(MC_NPPOOL, PhysPageDirectory.QuadPart >> PAGE_SHIFT);
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
memcpy(PageDir, &MmGlobalKernelPageDirectoryForPAE[0], 512 * sizeof(ULONGLONG)); memcpy(PageDir, &MmGlobalKernelPageDirectoryForPAE[i * 512], 512 * sizeof(ULONGLONG));
for (i = 0; i < 4; i++) if (PAE_ADDR_TO_PDTE_OFFSET(PAGETABLE_MAP) == i)
{ {
PageDir[PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) + i] = (Pfn[i] << PAGE_SHIFT) | PA_PRESENT | PA_READWRITE; for (j = 0; j < 4; j++)
{
PageDir[PAE_ADDR_TO_PDE_PAGE_OFFSET(PAGETABLE_MAP) + j] = (Pfn[j] << PAGE_SHIFT) | PA_PRESENT | PA_READWRITE;
}
} }
ExUnmapPage(PageDir); ExUnmapPage(PageDir);
} }
}
else else
{ {
PULONG PageDirectory; PULONG PageDirectory;
@ -482,7 +490,7 @@ MmGetPageTableForProcessForPAE(PEPROCESS Process, PVOID Address, BOOLEAN Create)
{ {
KEBUGCHECK(0); KEBUGCHECK(0);
} }
PageDir += PAE_ADDR_TO_PDE_OFFSET(Address); PageDir += PAE_ADDR_TO_PDE_PAGE_OFFSET(Address);
Entry = ExfInterlockedCompareExchange64(PageDir, &ZeroEntry, &ZeroEntry); Entry = ExfInterlockedCompareExchange64(PageDir, &ZeroEntry, &ZeroEntry);
if (Entry == 0LL) if (Entry == 0LL)
{ {
@ -2089,29 +2097,48 @@ VOID MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size)
PULONGLONG PageDirTable; PULONGLONG PageDirTable;
PULONGLONG Pde; PULONGLONG Pde;
ULONGLONG ZeroPde = 0LL; ULONGLONG ZeroPde = 0LL;
StartOffset = PAE_ADDR_TO_PDE_OFFSET(Address); ULONG i;
EndOffset = PAE_ADDR_TO_PDE_OFFSET(Address + Size);
for (i = PAE_ADDR_TO_PDTE_OFFSET(Address); i <= PAE_ADDR_TO_PDTE_OFFSET(Address + Size); i++)
{
if (i == PAE_ADDR_TO_PDTE_OFFSET(Address))
{
StartOffset = PAE_ADDR_TO_PDE_PAGE_OFFSET(Address);
}
else
{
StartOffset = 0;
}
if (i == PAE_ADDR_TO_PDTE_OFFSET(Address + Size))
{
EndOffset = PAE_ADDR_TO_PDE_PAGE_OFFSET(Address + Size);
}
else
{
EndOffset = 511;
}
if (Process != NULL && Process != PsGetCurrentProcess()) if (Process != NULL && Process != PsGetCurrentProcess())
{ {
PageDirTable = ExAllocatePageWithPhysPage(Process->Pcb.DirectoryTableBase.u.LowPart >> PAGE_SHIFT); PageDirTable = ExAllocatePageWithPhysPage(Process->Pcb.DirectoryTableBase.u.LowPart >> PAGE_SHIFT);
Pde = (PULONGLONG)ExAllocatePageWithPhysPage(PageDirTable[3] >> PAGE_SHIFT); Pde = (PULONGLONG)ExAllocatePageWithPhysPage(PageDirTable[i] >> PAGE_SHIFT);
ExUnmapPage(PageDirTable); ExUnmapPage(PageDirTable);
} }
else else
{ {
Pde = (PULONGLONG)PAE_PAGEDIRECTORY_MAP + 3*512; Pde = (PULONGLONG)PAE_PAGEDIRECTORY_MAP + i*512;
} }
for (Offset = StartOffset; Offset <= EndOffset; Offset++) for (Offset = StartOffset; Offset <= EndOffset; Offset++)
{ {
if (Offset < PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) || Offset >= PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP)+4) if (i * 512 + Offset < PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) || i * 512 + Offset >= PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP)+4)
{ {
ExfInterlockedCompareExchange64(&Pde[Offset], &MmGlobalKernelPageDirectoryForPAE[Offset], &ZeroPde); ExfInterlockedCompareExchange64(&Pde[Offset], &MmGlobalKernelPageDirectoryForPAE[i*512 + Offset], &ZeroPde);
} }
} }
MmUnmapPageTable((PULONG)Pde); MmUnmapPageTable((PULONG)Pde);
} }
}
else else
{ {
PULONG Pde; PULONG Pde;
@ -2146,8 +2173,8 @@ MmInitGlobalKernelPageDirectory(VOID)
ULONG i; ULONG i;
if (Ke386Pae) if (Ke386Pae)
{ {
PULONGLONG CurrentPageDirectory = (PULONGLONG)PAE_PAGEDIRECTORY_MAP + 3*512; PULONGLONG CurrentPageDirectory = (PULONGLONG)PAE_PAGEDIRECTORY_MAP;
for (i = 0; i < 512; i++) for (i = PAE_ADDR_TO_PDE_OFFSET(KERNEL_BASE); i < 4 * 512; i++)
{ {
if ((i < PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) || i >= PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) + 4) && if ((i < PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) || i >= PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) + 4) &&
0LL == MmGlobalKernelPageDirectoryForPAE[i] && 0LL != CurrentPageDirectory[i]) 0LL == MmGlobalKernelPageDirectoryForPAE[i] && 0LL != CurrentPageDirectory[i])
@ -2208,12 +2235,12 @@ MiEnablePAE(PVOID* LastKernelAddress)
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
PageDir[3*512+PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) + i] = PageDirTable[i] | PA_READWRITE; PageDir[3*512+PAE_ADDR_TO_PDE_PAGE_OFFSET(PAGETABLE_MAP) + i] = PageDirTable[i] | PA_READWRITE;
} }
for (i = 0; i < 2048; i++) for (i = 0; i < 2048; i++)
{ {
if (i < /*PAE_ADDR_TO_PDE_OFFSET(PAE_PAGEDIRECTORY_MAP)*/0x780 || i >= /*PAE_ADDR_TO_PDE_OFFSET(PAE_PAGEDIRECTORY_MAP)*/0x780 + 4) if (i < PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) || i >= PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) + 4)
{ {
PVOID Address = (PVOID)(i * 512 * PAGE_SIZE); PVOID Address = (PVOID)(i * 512 * PAGE_SIZE);
PULONG Pde = ADDR_TO_PDE(Address); PULONG Pde = ADDR_TO_PDE(Address);
@ -2266,7 +2293,7 @@ MiEnablePAE(PVOID* LastKernelAddress)
ULONG ULONG
MiGetUserPageDirectoryCount(VOID) MiGetUserPageDirectoryCount(VOID)
{ {
return Ke386Pae ? 1536 : 768; return Ke386Pae ? PAE_ADDR_TO_PDE_OFFSET(KERNEL_BASE) : ADDR_TO_PDE_OFFSET(KERNEL_BASE);
} }
VOID INIT_FUNCTION VOID INIT_FUNCTION