Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename KERNEL_LOAD_BASE_64BIT to KERNEL_LOAD_BASE_64_BIT for consistency.

This commit is contained in:
Alex Smith 2012-08-17 15:16:25 +01:00
parent e993391e9c
commit 9f629ef38e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
headers/private/kernel/arch/x86/arch_kernel.h
View File

@ -19,7 +19,7 @@
// 32-bit and 64-bit kernel load addresses.
#define KERNEL_LOAD_BASE 0x80000000
#define KERNEL_LOAD_BASE_64BIT 0xffffffff80000000ll
#define KERNEL_LOAD_BASE_64_BIT 0xffffffff80000000ll
#elif defined(__x86_64__)

6
src/system/boot/loader/elf.cpp
View File

@ -116,7 +116,7 @@ struct ELF64Class {
AllocateRegion(AddrType* _address, AddrType size, uint8 protection,
void **_mappedAddress)
{
// Assume the real 64-bit base address is KERNEL_LOAD_BASE_64BIT and
// Assume the real 64-bit base address is KERNEL_LOAD_BASE_64_BIT and
// the mappings in the loader address space are at KERNEL_LOAD_BASE.
void* address = (void*)(addr_t)(*_address & 0xffffffff);
@ -127,7 +127,7 @@ struct ELF64Class {
return status;
*_mappedAddress = address;
*_address = (AddrType)(addr_t)address + KERNEL_LOAD_BASE_64BIT
*_address = (AddrType)(addr_t)address + KERNEL_LOAD_BASE_64_BIT
- KERNEL_LOAD_BASE;
return B_OK;
}
@ -135,7 +135,7 @@ struct ELF64Class {
static inline void*
Map(AddrType address)
{
return (void*)(addr_t)(address - KERNEL_LOAD_BASE_64BIT
return (void*)(addr_t)(address - KERNEL_LOAD_BASE_64_BIT
+ KERNEL_LOAD_BASE);
}
};

6
src/system/boot/platform/bios_ia32/long.cpp
View File

@ -44,7 +44,7 @@ extern uint64 gLongKernelEntry;
static inline uint64
fix_address(uint64 address)
{
return address - KERNEL_LOAD_BASE + KERNEL_LOAD_BASE_64BIT;
return address - KERNEL_LOAD_BASE + KERNEL_LOAD_BASE_64_BIT;
}
@ -119,10 +119,10 @@ long_mmu_init()
gKernelArgs.arch_args.vir_pgdir = fix_address((uint64)(addr_t)pml4);
// Store the virtual memory usage information.
gKernelArgs.virtual_allocated_range[0].start = KERNEL_LOAD_BASE_64BIT;
gKernelArgs.virtual_allocated_range[0].start = KERNEL_LOAD_BASE_64_BIT;
gKernelArgs.virtual_allocated_range[0].size = mmu_get_virtual_usage();
gKernelArgs.num_virtual_allocated_ranges = 1;
gKernelArgs.arch_args.virtual_end = ROUNDUP(KERNEL_LOAD_BASE_64BIT
gKernelArgs.arch_args.virtual_end = ROUNDUP(KERNEL_LOAD_BASE_64_BIT
+ gKernelArgs.virtual_allocated_range[0].size, 0x200000);
// Find the highest physical memory address. We map all physical memory