From 4e8d025345ac5769562189b7df65cdae3cd3c4a1 Mon Sep 17 00:00:00 2001 From: pjht Date: Wed, 29 Mar 2023 09:47:37 -0500 Subject: [PATCH] Fix PMM function names - they handle physical frames, not virtual pages --- kernel/main.68k | 10 +++++----- kernel/pmem.68k | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kernel/main.68k b/kernel/main.68k index c00fa96..1ce2acd 100644 --- a/kernel/main.68k +++ b/kernel/main.68k @@ -4,13 +4,13 @@ main: jsr term_init jsr pmem_init move.l #0x1000, d0 - jsr push_page + jsr push_frame move.l #0x2000, d0 - jsr push_page + jsr push_frame move.l #0, d0 - jsr pop_page - jsr pop_page - jsr pop_page + jsr pop_frame + jsr pop_frame + jsr pop_frame stop #0x2700 .bss diff --git a/kernel/pmem.68k b/kernel/pmem.68k index 782f680..5db9efc 100644 --- a/kernel/pmem.68k +++ b/kernel/pmem.68k @@ -13,9 +13,9 @@ adda.l d1, a0 move.l a0, map_page_entry_addr rts -.global push_page -| Page to push in d0 -push_page: +.global push_frame +| Frame to push in d0 +push_frame: move.l map_page_entry_addr, a0 move.l (a0), d1 | Read the mapping entry into d1 andi.l #(~0xFFF), d1 | Clear the entry's flags to get the pointer to it's physical page @@ -26,8 +26,8 @@ move.l #map_page, (a0) move.l d1, (map_page) rts -.global pop_page -pop_page: +.global pop_frame +pop_frame: move.l map_page_entry_addr, a0 move.l (a0), d0 | Read the mapping entry into d0 btst #0, d0 | Check the entry's present flag