From 7f058ffc9032dc169e2fb8b7cb3022d0daaf024b Mon Sep 17 00:00:00 2001 From: sBubshait Date: Fri, 6 Dec 2024 16:22:26 +0000 Subject: [PATCH] Refactor page_type to rename PAGE_FILE to PAGE_EXECUTABLE as mmap and executables are now separate --- src/userprog/exception.c | 2 +- src/userprog/process.c | 2 +- src/vm/page.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/userprog/exception.c b/src/userprog/exception.c index db07db9..84de825 100644 --- a/src/userprog/exception.c +++ b/src/userprog/exception.c @@ -289,7 +289,7 @@ fetch_page (void *upage, bool write) bool success = false; switch (page->type) { case PAGE_MMAP: - case PAGE_FILE: + case PAGE_EXECUTABLE: case PAGE_SHARED: success = page_load_file (page); break; diff --git a/src/userprog/process.c b/src/userprog/process.c index ca99aee..9024540 100644 --- a/src/userprog/process.c +++ b/src/userprog/process.c @@ -715,7 +715,7 @@ load_segment (struct file *file, off_t ofs, uint8_t *upage, /* Add the page metadata to the SPT to be lazy loaded later on */ if (page_insert_file (file, ofs, upage, page_read_bytes, page_zero_bytes, - writable, PAGE_FILE) == NULL) + writable, PAGE_EXECUTABLE) == NULL) return false; /* Advance. */ diff --git a/src/vm/page.h b/src/vm/page.h index 9aa98fb..994da72 100644 --- a/src/vm/page.h +++ b/src/vm/page.h @@ -7,7 +7,7 @@ enum page_type { - PAGE_FILE, + PAGE_EXECUTABLE, PAGE_MMAP, PAGE_SHARED };