midgard/tabs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add 2 column printing for more space efficiency.

Browse source
This commit is contained in:
Maxime Bloch 2020-01-29 04:31:44 +01:00
parent c66bb87aaf
commit 3af5ab06a7
No known key found for this signature in database
GPG key ID: CE32A7D95B7D6418
2 changed files with 45 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/kernel.c
View file

@ -65,6 +65,8 @@ void kernel_main(void) {
interrupt_init(); interrupt_init();
print_memory();
for (;;) { for (;;) {
shell_step(); shell_step();
} }

46
kernel/memory.c
View file

@ -58,30 +58,68 @@ void free(void *data) {
data_tag->next->prev = data_tag->prev; data_tag->next->prev = data_tag->prev;
} }
#define PRINT_MEM_WITH_COLUMNS = 1
int amount_of_digits(int x) {
if (x == 0) return 1;
int n = 0;
while (x != 0) {
n += 1;
x /= 10;
}
return n;
}
void print_memory() { void print_memory() {
print("____________________\n"); print("____________________\n");
print(" === MEM DUMP === \n"); print(" === MEM DUMP === \n");
page_tag *curr_page = start; page_tag *curr_page = start;
int i = 0; int i = 0;
bool left = true;
while (curr_page != NULL) { while (curr_page != NULL) {
print("%d: [%x (%d)] [%x (%d)]\n", char padding[4] = {' ', ' ', ' ', ' '};
padding[4 - amount_of_digits(curr_page->size)] = '\0';
print("%d: [%x (%d)] [%x (%s%d)]",
i, i,
curr_page, sizeof(page_tag), curr_page, sizeof(page_tag),
(curr_page + 1), curr_page->size); (curr_page + 1), padding, curr_page->size);
if (left) {
print(" | ");
} else {
print("\n");
}
left = !left;
bool empty_print = false;
void *empty_start = (void *) curr_page + sizeof(page_tag) + curr_page->size; void *empty_start = (void *) curr_page + sizeof(page_tag) + curr_page->size;
if (empty_start + sizeof(page_tag) < (void *) curr_page->next) { if (empty_start + sizeof(page_tag) < (void *) curr_page->next) {
print("_: empty page (%d, %d)\n", print("_: empty page (%d, %d)",
sizeof(page_tag), sizeof(page_tag),
(void *) curr_page->next - (void *) curr_page->next -
(empty_start + sizeof(page_tag))); (empty_start + sizeof(page_tag)));
empty_print = true;
} else if (empty_start < (void *) curr_page->next) { } else if (empty_start < (void *) curr_page->next) {
print("_: not enough room (%d)\n", print("_: not enough room (%d)",
(void *) curr_page->next - empty_start); (void *) curr_page->next - empty_start);
empty_print = true;
} }
if (empty_print) {
if (left) {
print(" | ");
} else {
print("\n");
}
left = !left;
}
curr_page = curr_page->next; curr_page = curr_page->next;
i += 1; i += 1;
} }
if (!left) {
print("\n");
}
print("____________________\n"); print("____________________\n");
} }