Merge 'vm/merged/pinning-synch' into master #64

Merged
sb3923 merged 8 commits from vm/merged/pinning-synch into master 2024-12-06 16:31:38 +00:00
8 changed files with 40 additions and 36 deletions
Showing only changes of commit 7f058ffc90 - Show all commits

View File

@@ -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;

View File

@@ -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. */

View File

@@ -7,7 +7,7 @@
enum page_type
{
PAGE_FILE,
PAGE_EXECUTABLE,
PAGE_MMAP,
PAGE_SHARED
};