xt-sys/exectos
xt-sys/exectos
3
5
Fork 3
Code Issues 3 Pull Requests 1 Actions Projects 1 Releases Wiki Activity

Reorganisation of KeStartXtSystem() routine and early debug printing
All checks were successful
ci/woodpecker/push/build Pipeline was successful
Details

Browse Source
This commit is contained in:
Rafal Kupiec 2023-01-04 23:08:59 +01:00
parent b7e5f1b5c1
commit 5730e8692e
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
4 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/xtdk/xtdebug.h
View File

@ -13,10 +13,10 @@
/* XTOS platform debugging macros */ /* XTOS platform debugging macros */
#ifdef DBG #ifdef DBG
#define DEBUG 1 #define DEBUG 1
#define LDRPRINT(Format, ...) if(LdrPrint) LdrPrint(Format, __VA_ARGS__); #define LdrPrint(Format, ...) if(LdrDbgPrint) LdrDbgPrint(Format, __VA_ARGS__);
#else #else
#define DEBUG 0 #define DEBUG 0
#define LDRPRINT(Format, ...) ((VOID)NULL) #define LdrPrint(Format, ...) ((VOID)NULL)
#endif #endif
#endif /* __XTDK_XTDEBUG_H */ #endif /* __XTDK_XTDEBUG_H */

5
xtoskrnl/includes/globals.h
View File

@ -12,6 +12,9 @@
#include <xtkmapi.h> #include <xtkmapi.h>
/* Kernel initialization block passed by boot loader */
EXTERN PKERNEL_INITIALIZATION_BLOCK KeInitializationBlock;
/* Kernel own boot stack */ /* Kernel own boot stack */
EXTERN UCHAR KepKernelBootStackData[KERNEL_STACK_SIZE]; EXTERN UCHAR KepKernelBootStackData[KERNEL_STACK_SIZE];
@ -19,6 +22,6 @@ EXTERN UCHAR KepKernelBootStackData[KERNEL_STACK_SIZE];
EXTERN UCHAR KepKernelFaultStackData[KERNEL_STACK_SIZE]; EXTERN UCHAR KepKernelFaultStackData[KERNEL_STACK_SIZE];
/* Pointer to boot loader provided DbgPrint() routine */ /* Pointer to boot loader provided DbgPrint() routine */
EXTERN VOID (*LdrPrint)(IN PWCHAR Format, IN ...); EXTERN VOID (*LdrDbgPrint)(IN PWCHAR Format, IN ...);
#endif /* __XTOSKRNL_GLOBALS_H */ #endif /* __XTOSKRNL_GLOBALS_H */

5
xtoskrnl/ke/globals.c
View File

@ -9,6 +9,9 @@
#include <xtos.h> #include <xtos.h>
/* Kernel initialization block passed by boot loader */
PKERNEL_INITIALIZATION_BLOCK KeInitializationBlock;
/* Kernel own boot stack */ /* Kernel own boot stack */
UCHAR KepKernelBootStackData[KERNEL_STACK_SIZE] = {0}; UCHAR KepKernelBootStackData[KERNEL_STACK_SIZE] = {0};
@ -16,4 +19,4 @@ UCHAR KepKernelBootStackData[KERNEL_STACK_SIZE] = {0};
UCHAR KepKernelFaultStackData[KERNEL_STACK_SIZE] = {0}; UCHAR KepKernelFaultStackData[KERNEL_STACK_SIZE] = {0};
/* Pointer to boot loader provided DbgPrint() routine */ /* Pointer to boot loader provided DbgPrint() routine */
VOID (*LdrPrint)(IN PWCHAR Format, IN ...) = NULL; VOID (*LdrDbgPrint)(IN PWCHAR Format, IN ...) = NULL;

40
xtoskrnl/ke/krnlinit.c
View File

@ -27,14 +27,29 @@ KeStartXtSystem(IN PKERNEL_INITIALIZATION_BLOCK Parameters)
if(DEBUG && Parameters->LoaderInformation.DbgPrint) if(DEBUG && Parameters->LoaderInformation.DbgPrint)
{ {
/* Use loader's provided DbgPrint() routine for early printing to serial console */ /* Use loader's provided DbgPrint() routine for early printing to serial console */
LdrPrint = Parameters->LoaderInformation.DbgPrint; LdrDbgPrint = Parameters->LoaderInformation.DbgPrint;
} }
/* Print some message to serial console and test kernel parameters */
LdrPrint(L"Hello world from ExectOS kernel!\n");
LdrPrint(L"\n\n------ Kernel parameters block ------\n"
L"Loader block size: %lu\n"
L"Loader block version: %lu\n"
L"EFI Revision: %lu\n"
L"EFI RunTime Revision: %lu\n\n",
Parameters->Size,
Parameters->Version,
Parameters->FirmwareInformation.EfiFirmware.EfiVersion,
((PEFI_RUNTIME_SERVICES) Parameters->FirmwareInformation.EfiFirmware.EfiRuntimeServices)->Hdr.Revision
);
/* Make sure kernel boot stack is initialized */ /* Make sure kernel boot stack is initialized */
if(!Parameters->KernelBootStack) if(!Parameters->KernelBootStack)
{ {
/* Initialize kernel boot stack */ /* Initialize kernel boot stack */
LDRPRINT(L"Initializing kernel boot stack\n"); LdrPrint(L"Initializing kernel boot stack\n");
Parameters->KernelBootStack = (ULONG_PTR)&KepKernelBootStackData[KERNEL_STACK_SIZE]; Parameters->KernelBootStack = (ULONG_PTR)&KepKernelBootStackData[KERNEL_STACK_SIZE];
} }
@ -42,25 +57,10 @@ KeStartXtSystem(IN PKERNEL_INITIALIZATION_BLOCK Parameters)
if(!Parameters->KernelFaultStack) if(!Parameters->KernelFaultStack)
{ {
/* Initialize kernel fault stack */ /* Initialize kernel fault stack */
LDRPRINT(L"Initializing kernel fault stack\n"); LdrPrint(L"Initializing kernel fault stack\n");
Parameters->KernelFaultStack = (ULONG_PTR)&KepKernelFaultStackData[KERNEL_STACK_SIZE]; Parameters->KernelFaultStack = (ULONG_PTR)&KepKernelFaultStackData[KERNEL_STACK_SIZE];
} }
/* Print some message to serial console */ /* Save the kernel initialization block */
LDRPRINT(L"Hello world from ExectOS kernel!\n"); KeInitializationBlock = Parameters;
/* Test kernel parameters */
LDRPRINT(L"\n\n------ Kernel parameters block ------\n"
L"Loader block size: %lu\n"
L"Loader block version: %lu\n"
L"EFI Revision: %lu\n"
L"EFI RunTime Revision: %lu\n",
Parameters->Size,
Parameters->Version,
Parameters->FirmwareInformation.EfiFirmware.EfiVersion,
((PEFI_RUNTIME_SERVICES) Parameters->FirmwareInformation.EfiFirmware.EfiRuntimeServices)->Hdr.Revision
);
/* Enter infinite kernel thread loop */
for(;;);
} }