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

Rename ASMCODE to ROS_KERNEL_ENTRY_POINT

Browse source 
svn path=/trunk/; revision=31375
This commit is contained in:
Hervé Poussineau 2007-12-21 14:57:31 +00:00
parent 148fd39043
commit be15618a7f
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/boot/freeldr/freeldr/arch/i386/loader.c
View file

@ -34,7 +34,7 @@ PLOADER_MODULE CurrentModule = NULL;
ULONG_PTR KernelBase; ULONG_PTR KernelBase;
/* Kernel Entrypoint in Virtual Memory */ /* Kernel Entrypoint in Virtual Memory */
ULONG_PTR KernelEntryPoint; ROS_KERNEL_ENTRY_POINT KernelEntryPoint;
/* Page Directory and Tables for non-PAE Systems */ /* Page Directory and Tables for non-PAE Systems */
extern PAGE_DIRECTORY_X86 startup_pagedirectory; extern PAGE_DIRECTORY_X86 startup_pagedirectory;
@ -108,7 +108,6 @@ FASTCALL
FrLdrSetupPae(ULONG Magic) FrLdrSetupPae(ULONG Magic)
{ {
ULONG_PTR PageDirectoryBaseAddress = (ULONG_PTR)&startup_pagedirectory; ULONG_PTR PageDirectoryBaseAddress = (ULONG_PTR)&startup_pagedirectory;
ASMCODE PagedJump;
/* Set the PDBR */ /* Set the PDBR */
__writecr3(PageDirectoryBaseAddress); __writecr3(PageDirectoryBaseAddress);
@ -117,8 +116,7 @@ FrLdrSetupPae(ULONG Magic)
__writecr0(__readcr0() | X86_CR0_PG | X86_CR0_WP); __writecr0(__readcr0() | X86_CR0_PG | X86_CR0_WP);
/* Jump to Kernel */ /* Jump to Kernel */
PagedJump = (ASMCODE)(PVOID)(KernelEntryPoint); (*KernelEntryPoint)(Magic, &LoaderBlock);
PagedJump(Magic, &LoaderBlock);
} }
/*++ /*++

2
reactos/boot/freeldr/freeldr/include/reactos.h
View file

@ -100,7 +100,7 @@ ULONG_PTR NTAPI FrLdrCreateModule(LPCSTR ModuleName);
ULONG_PTR NTAPI FrLdrLoadModule(FILE *ModuleImage, LPCSTR ModuleName, PULONG ModuleSize); ULONG_PTR NTAPI FrLdrLoadModule(FILE *ModuleImage, LPCSTR ModuleName, PULONG ModuleSize);
BOOLEAN NTAPI FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG dwModuleSize); BOOLEAN NTAPI FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG dwModuleSize);
VOID NTAPI FrLdrStartup(ULONG Magic); VOID NTAPI FrLdrStartup(ULONG Magic);
typedef VOID (FASTCALL *ASMCODE)(ULONG Magic, PROS_LOADER_PARAMETER_BLOCK LoaderBlock); typedef VOID (FASTCALL *ROS_KERNEL_ENTRY_POINT)(ULONG Magic, PROS_LOADER_PARAMETER_BLOCK LoaderBlock);
PVOID PVOID
NTAPI NTAPI

5
reactos/boot/freeldr/freeldr/reactos/reactos.c
View file

@ -42,7 +42,8 @@ CHAR szBootPath[255];
CHAR SystemRoot[255]; CHAR SystemRoot[255];
static CHAR szLoadingMsg[] = "Loading ReactOS..."; static CHAR szLoadingMsg[] = "Loading ReactOS...";
BOOLEAN FrLdrBootType; BOOLEAN FrLdrBootType;
extern ULONG_PTR KernelBase, KernelEntryPoint; extern ULONG_PTR KernelBase;
extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint;
BOOLEAN BOOLEAN
FrLdrLoadDriver(PCHAR szFileName, FrLdrLoadDriver(PCHAR szFileName,
@ -772,7 +773,7 @@ LoadAndBootReactOS(PCSTR OperatingSystemName)
/* Get the NT header, kernel base and kernel entry */ /* Get the NT header, kernel base and kernel entry */
NtHeader = RtlImageNtHeader(LoadBase); NtHeader = RtlImageNtHeader(LoadBase);
KernelBase = SWAPD(NtHeader->OptionalHeader.ImageBase); KernelBase = SWAPD(NtHeader->OptionalHeader.ImageBase);
KernelEntryPoint = KernelBase + SWAPD(NtHeader->OptionalHeader.AddressOfEntryPoint); KernelEntryPoint = (ROS_KERNEL_ENTRY_POINT)(KernelBase + SWAPD(NtHeader->OptionalHeader.AddressOfEntryPoint));
LoaderBlock.KernelBase = KernelBase; LoaderBlock.KernelBase = KernelBase;
/* /*

5
reactos/boot/freeldr/freeldr/reactos/setupldr.c
View file

@ -34,7 +34,8 @@ extern char reactos_arc_hardware_data[HW_MAX_ARC_HEAP_SIZE];
char szBootPath[256]; char szBootPath[256];
char szHalName[256]; char szHalName[256];
CHAR SystemRoot[255]; CHAR SystemRoot[255];
extern ULONG_PTR KernelBase, KernelEntryPoint; extern ULONG_PTR KernelBase;
extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint;
extern BOOLEAN FrLdrLoadDriver(PCHAR szFileName, INT nPos); extern BOOLEAN FrLdrLoadDriver(PCHAR szFileName, INT nPos);
@ -86,7 +87,7 @@ static FrLdrLoadKernel(IN PCHAR szFileName,
/* Get the NT header, kernel base and kernel entry */ /* Get the NT header, kernel base and kernel entry */
NtHeader = RtlImageNtHeader(LoadBase); NtHeader = RtlImageNtHeader(LoadBase);
KernelBase = NtHeader->OptionalHeader.ImageBase; KernelBase = NtHeader->OptionalHeader.ImageBase;
KernelEntryPoint = KernelBase + NtHeader->OptionalHeader.AddressOfEntryPoint; KernelEntryPoint = (ROS_KERNEL_ENTRY_POINT)(KernelBase + NtHeader->OptionalHeader.AddressOfEntryPoint);
LoaderBlock.KernelBase = KernelBase; LoaderBlock.KernelBase = KernelBase;
/* Update Processbar and return success */ /* Update Processbar and return success */