Skip to content

Commit 6e4e9ed

Browse files
Merge branch 'main' into codex/fix-invalid-opcode-in-busybox
2 parents 315bd41 + ad5763d commit 6e4e9ed

3 files changed

Lines changed: 5 additions & 1 deletion

File tree

source/kernel/C/executables/elf.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111
#include <executables/elf.h>
1212
#include <fdlfcn.h>
13+
#include <graphics.h>
1314
#include <memory.h>
1415
#include <stdint.h>
1516
#include <heap.h>
@@ -159,7 +160,7 @@ static void elf_log_load_progress(uint16_t current, uint16_t total, Elf64_Phdr*
159160
bar[i] = (i < filled) ? '#' : '-';
160161
bar[20] = '\0';
161162

162-
printf("elf: [%s] %u%% (%u/%u) type=%u vaddr=%x off=%x",
163+
printf(blue_color "elf: [%s] %u% (%02u/%02u) type=%u vaddr=%x off=%x" reset_color,
163164
bar,
164165
pct,
165166
(uint32_t)(current + 1),

source/kernel/C/interrupts/isr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <keyboard.h>
1414
#include <memory.h>
1515
#include <drivers/rtl8139.h>
16+
#include <syscalls.h>
1617

1718
irq_handler interrupt_handlers[256];
1819

source/kernel/C/meltdown.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
* @copyright Copyright (c) Pradosh 2023
99
*
1010
*/
11+
#include <graphics.h>
1112
#include <meltdown.h>
1213
#include <isr.h> // For InterruptFrame
1314

@@ -81,6 +82,7 @@ if (frame) {
8182
frame->r9,
8283
frame->r10,
8384
frame->r11);
85+
eprintf("[MELTDOWN] regs SS = 0x%X", frame->ss);
8486
}
8587
#endif
8688
}

0 commit comments

Comments
 (0)