NuKVM/memtest86plus
3
0
Fork 0
mirror of https://github.com/memtest86plus/memtest86plus.git synced 2025-02-25 18:55:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Call cpuid_init() before the first call to map_region().

Browse Source 
map_region() uses the long mode flag, so that must be initialised first.
This commit is contained in:
Martin Whitaker 2022-05-09 18:17:19 +01:00
parent e429abec9f
commit ef3f0bc1e5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/main.c
View File

@ -197,15 +197,16 @@ static bool set_load_addr(uintptr_t *load_addr, size_t program_size, uintptr_t l
static void global_init(void) static void global_init(void)
{ {
// This is the first region we map, so is guaranteed not to fail.
boot_params_addr = map_region(boot_params_addr, sizeof(boot_params_t), true);
floppy_off(); floppy_off();
hwctrl_init();
cpuid_init(); cpuid_init();
// Nothing before this should access the boot parameters, in case they are located above 4GB.
// This is the first region we map, so it is guaranteed not to fail.
boot_params_addr = map_region(boot_params_addr, sizeof(boot_params_t), true);
hwctrl_init();
screen_init(); screen_init();
cpuinfo_init(); cpuinfo_init();