Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HAL] Use 64 bits for physical addresses.

Browse source
This commit is contained in:
Timo Kreuzer 2017-12-17 17:37:43 +01:00
parent dcd95c1a85
commit 5311c57b5f
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hal/halx86/generic/memory.c
View file

@ -24,15 +24,15 @@ PVOID HalpHeapStart = MM_HAL_HEAP_START;
/* PRIVATE FUNCTIONS *********************************************************/ /* PRIVATE FUNCTIONS *********************************************************/
ULONG_PTR ULONG64
NTAPI NTAPI
HalpAllocPhysicalMemory(IN PLOADER_PARAMETER_BLOCK LoaderBlock, HalpAllocPhysicalMemory(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
IN ULONG_PTR MaxAddress, IN ULONG64 MaxAddress,
IN PFN_NUMBER PageCount, IN PFN_NUMBER PageCount,
IN BOOLEAN Aligned) IN BOOLEAN Aligned)
{ {
ULONG UsedDescriptors; ULONG UsedDescriptors;
ULONG_PTR PhysicalAddress; ULONG64 PhysicalAddress;
PFN_NUMBER MaxPage, BasePage, Alignment; PFN_NUMBER MaxPage, BasePage, Alignment;
PLIST_ENTRY NextEntry; PLIST_ENTRY NextEntry;
PMEMORY_ALLOCATION_DESCRIPTOR MdBlock, NewBlock, FreeBlock; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock, NewBlock, FreeBlock;
@ -71,9 +71,8 @@ HalpAllocPhysicalMemory(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
(MdBlock->PageCount >= PageCount + Alignment) && (MdBlock->PageCount >= PageCount + Alignment) &&
(BasePage + PageCount + Alignment < MaxPage)) (BasePage + PageCount + Alignment < MaxPage))
{ {
/* We found an address */ /* We found an address */
PhysicalAddress = (BasePage + Alignment) << PAGE_SHIFT; PhysicalAddress = ((ULONG64)BasePage + Alignment) << PAGE_SHIFT;
break; break;
} }
} }

4
hal/halx86/include/halp.h
View file

@ -633,11 +633,11 @@ HalpReleasePciDeviceForDebugging(
// //
// Memory routines // Memory routines
// //
ULONG_PTR ULONG64
NTAPI NTAPI
HalpAllocPhysicalMemory( HalpAllocPhysicalMemory(
IN PLOADER_PARAMETER_BLOCK LoaderBlock, IN PLOADER_PARAMETER_BLOCK LoaderBlock,
IN ULONG_PTR MaxAddress, IN ULONG64 MaxAddress,
IN PFN_NUMBER PageCount, IN PFN_NUMBER PageCount,
IN BOOLEAN Aligned IN BOOLEAN Aligned
); );