diff options
| author | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-07-10 01:13:08 +0200 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-07-10 01:13:08 +0200 |
| commit | 5f6549b7d46118ba416faa170ff088d98c9144f0 (patch) | |
| tree | 23d19bc039a547f27275065d96c52551d8ca989f /Boot | |
| parent | dfaf137915094e7ba72f7d7f1f57dc5158d1b6ab (diff) | |
MHR-36: See below.
- Implement MSR functions has_msr, get_msr, set_msr.
- Moved SMP interrupt to interrupt 34 in AMD64.
- Fix syntax error in STB.hxx.
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'Boot')
| -rw-r--r-- | Boot/BootKit/STB.hxx | 4 | ||||
| -rw-r--r-- | Boot/Sources/HEL/AMD64/BootMain.cxx | 3 | ||||
| -rw-r--r-- | Boot/amd64-efi.make | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Boot/BootKit/STB.hxx b/Boot/BootKit/STB.hxx index b94572d7..6e9b8067 100644 --- a/Boot/BootKit/STB.hxx +++ b/Boot/BootKit/STB.hxx @@ -18,8 +18,10 @@ #define STBI_ASSERT(x) MUST_PASS(x) #define STBI_MALLOC(x) Kernel::ke_new_ke_heap(x, true, true) -#define STBI_REALLOC(p, x) Kernel::ke_update_ke_heap(p, x); +#define STBI_REALLOC(p, x) Kernel::ke_realloc_ke_heap(p, x); #define STBI_FREE(x) Kernel::ke_delete_ke_heap(x) #define STB_IMAGE_IMPLEMENTATION 1 +#include <KernelKit/KernelHeap.hpp> + #include <BootKit/Vendor/stb_image.hxx> diff --git a/Boot/Sources/HEL/AMD64/BootMain.cxx b/Boot/Sources/HEL/AMD64/BootMain.cxx index 928bc5de..ce4074b2 100644 --- a/Boot/Sources/HEL/AMD64/BootMain.cxx +++ b/Boot/Sources/HEL/AMD64/BootMain.cxx @@ -16,10 +16,9 @@ #include <NewKit/Macros.hpp> #include <NewKit/Ref.hpp> #include <BootKit/ProgramLoader.hxx> -#include <KernelKit/KernelHeap.hpp> #include <cstring> -#include <BootKit/Vendor/Support.hxx>ke_realloc_ke_heap +#include <BootKit/Vendor/Support.hxx> #include <BootKit/STB.hxx> /// make the compiler shut up. diff --git a/Boot/amd64-efi.make b/Boot/amd64-efi.make index 1ce6e295..294bfb9e 100644 --- a/Boot/amd64-efi.make +++ b/Boot/amd64-efi.make @@ -29,7 +29,7 @@ IMG=epm-master-1.img IMG_2=epm-slave.img IMG_3=epm-master-2.img -EMU_FLAGS=-net none -m 4G -M q35 -d int \ +EMU_FLAGS=-net none -smp 2 -m 4G -M q35 -serial stdio \ -bios $(BIOS) -device piix3-ide,id=ide \ -drive id=disk,file=$(IMG),format=raw,if=none \ -device ide-hd,drive=disk,bus=ide.0 -drive \ |