summaryrefslogtreecommitdiff
path: root/src/kernel
diff options
context:
space:
mode:
authorBenji Dial <benji3.141@gmail.com>2019-12-27 22:02:56 -0500
committerBenji Dial <benji3.141@gmail.com>2019-12-27 22:02:56 -0500
commit4906ad3388158aabec85b0345ccdfa7df4b16479 (patch)
tree442ca2991330ddd7c5c137653f6a648254d4b14b /src/kernel
parentdbfa44db9cb2674e590c8c9d7bad2feace93fd44 (diff)
downloadportland-os-4906ad3388158aabec85b0345ccdfa7df4b16479.tar.gz
memory map explanation
Diffstat (limited to 'src/kernel')
-rw-r--r--src/kernel/main.c2
-rw-r--r--src/kernel/stub.asm1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/kernel/main.c b/src/kernel/main.c
index f49d9e6..3377a76 100644
--- a/src/kernel/main.c
+++ b/src/kernel/main.c
@@ -397,7 +397,7 @@ uint32_t main(void) {
put_sz(": ignoring");
}
- tag_pointer = (struct tag_start *)(((uint32_t)tag_pointer + tag_pointer->size - 1 & 0xfffffff8) + 8);
+ tag_pointer = (struct tag_start *)(((uint32_t)tag_pointer + tag_pointer->size - 1 & ~0x00000007) + 8);
}
if (!have_boot_device)
diff --git a/src/kernel/stub.asm b/src/kernel/stub.asm
index bad26aa..d5d81ef 100644
--- a/src/kernel/stub.asm
+++ b/src/kernel/stub.asm
@@ -31,7 +31,6 @@ dw 0x0000;flags
dd mb_end - $$ - 16
dd 5;boot device
dd 6;memory map
-
mb_end:
section .text