m68k-backplane-computer/emu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add executable flag support to MMU

Browse Source
This commit is contained in:
pjht 2024-03-14 13:29:50 -05:00
parent 40acac97b5
commit 0653fc3330
Signed by: pjht
GPG Key ID: CA239FC6934E6F3A
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/mmu.rs
View File

@ -12,6 +12,7 @@ use crate::{
const ID: u16 = 5; const ID: u16 = 5;
const TLB_MAPPING_FLAG_VALID: u32 = 0x800; const TLB_MAPPING_FLAG_VALID: u32 = 0x800;
const MAPPING_FLAG_EXECUTABLE: u32 = 0x8;
const MAPPING_FLAG_USER: u32 = 0x4; const MAPPING_FLAG_USER: u32 = 0x4;
const MAPPING_FLAG_WRITABLE: u32 = 0x2; const MAPPING_FLAG_WRITABLE: u32 = 0x2;
const MAPPING_FLAG_PRESENT: u32 = 0x1; const MAPPING_FLAG_PRESENT: u32 = 0x1;
@ -177,14 +178,17 @@ impl Card for MmuCard {
let present_flag = (flags & MAPPING_FLAG_PRESENT) > 0; let present_flag = (flags & MAPPING_FLAG_PRESENT) > 0;
let wr_flag = (flags & MAPPING_FLAG_WRITABLE) > 0; let wr_flag = (flags & MAPPING_FLAG_WRITABLE) > 0;
let user_flag = (flags & MAPPING_FLAG_USER) > 0; let user_flag = (flags & MAPPING_FLAG_USER) > 0;
let exec_flag = (flags & MAPPING_FLAG_EXECUTABLE) > 0;
let present_flag = if present_flag { "P" } else { "_" }; let present_flag = if present_flag { "P" } else { "_" };
let wr_flag = if wr_flag { "W" } else { "_" }; let wr_flag = if wr_flag { "W" } else { "_" };
let user_flag = if user_flag { "U" } else { "_" }; let user_flag = if user_flag { "U" } else { "_" };
let exec_flag = if exec_flag { "X" } else { "_" };
if j == i { if j == i {
println!( println!(
"0x{:0>6x}: 0x{:0>8x} ({}{}{})", "0x{:0>6x}: 0x{:0>8x} ({}{}{}{})",
i << 12, i << 12,
frame, frame,
exec_flag,
user_flag, user_flag,
wr_flag, wr_flag,
present_flag present_flag
@ -193,10 +197,11 @@ impl Card for MmuCard {
} else { } else {
if range_one_page.unwrap() { if range_one_page.unwrap() {
println!( println!(
"0x{:0>6x}-0x{:0>6x}: 0x{:0>8x} ({}{}{})", "0x{:0>6x}-0x{:0>6x}: 0x{:0>8x} ({}{}{}{})",
i << 12, i << 12,
j << 12, j << 12,
frame, frame,
exec_flag,
user_flag, user_flag,
wr_flag, wr_flag,
present_flag present_flag
@ -204,11 +209,12 @@ impl Card for MmuCard {
} else { } else {
let range_len = (j - i) as u32; let range_len = (j - i) as u32;
println!( println!(
"0x{:0>6x}-0x{:0>6x}: 0x{:0>8x}-0x{:0>8x} ({}{}{})", "0x{:0>6x}-0x{:0>6x}: 0x{:0>8x}-0x{:0>8x} ({}{}{}{})",
i << 12, i << 12,
j << 12, j << 12,
frame, frame,
frame + (range_len * 0x1000), frame + (range_len * 0x1000),
exec_flag,
user_flag, user_flag,
wr_flag, wr_flag,
present_flag present_flag
@ -259,14 +265,17 @@ impl Card for MmuCard {
let present_flag = (flags & MAPPING_FLAG_PRESENT) > 0; let present_flag = (flags & MAPPING_FLAG_PRESENT) > 0;
let wr_flag = (flags & MAPPING_FLAG_WRITABLE) > 0; let wr_flag = (flags & MAPPING_FLAG_WRITABLE) > 0;
let user_flag = (flags & MAPPING_FLAG_USER) > 0; let user_flag = (flags & MAPPING_FLAG_USER) > 0;
let exec_flag = (flags & MAPPING_FLAG_EXECUTABLE) > 0;
let present_flag = if present_flag { "P" } else { "_" }; let present_flag = if present_flag { "P" } else { "_" };
let wr_flag = if wr_flag { "W" } else { "_" }; let wr_flag = if wr_flag { "W" } else { "_" };
let user_flag = if user_flag { "U" } else { "_" }; let user_flag = if user_flag { "U" } else { "_" };
let exec_flag = if exec_flag { "X" } else { "_" };
if j == i { if j == i {
println!( println!(
"0x{:0>6x}: 0x{:0>8x} ({}{}{})", "0x{:0>6x}: 0x{:0>8x} ({}{}{}{})",
i << 12, i << 12,
frame, frame,
exec_flag,
user_flag, user_flag,
wr_flag, wr_flag,
present_flag present_flag
@ -275,10 +284,11 @@ impl Card for MmuCard {
} else { } else {
if range_one_page.unwrap() { if range_one_page.unwrap() {
println!( println!(
"0x{:0>6x}-0x{:0>6x}: 0x{:0>8x} ({}{}{})", "0x{:0>6x}-0x{:0>6x}: 0x{:0>8x} ({}{}{}{})",
i << 12, i << 12,
j << 12, j << 12,
frame, frame,
exec_flag,
user_flag, user_flag,
wr_flag, wr_flag,
present_flag present_flag
@ -286,11 +296,12 @@ impl Card for MmuCard {
} else { } else {
let range_len = (j - i) as u32; let range_len = (j - i) as u32;
println!( println!(
"0x{:0>6x}-0x{:0>6x}: 0x{:0>8x}-0x{:0>8x} ({}{}{})", "0x{:0>6x}-0x{:0>6x}: 0x{:0>8x}-0x{:0>8x} ({}{}{}{})",
i << 12, i << 12,
j << 12, j << 12,
frame, frame,
frame + (range_len * 0x1000), frame + (range_len * 0x1000),
exec_flag,
user_flag, user_flag,
wr_flag, wr_flag,
present_flag present_flag
@ -368,6 +379,12 @@ impl Mmu for MmuCard {
mapping mapping
}; };
if mapping & MAPPING_FLAG_PRESENT > 0 { if mapping & MAPPING_FLAG_PRESENT > 0 {
if function.is_code() && (mapping & MAPPING_FLAG_EXECUTABLE == 0) {
if print_debug {
println!("Page not executable");
}
return NullableResult::Err(BusError);
}
if !function.is_supervisor() && (mapping & MAPPING_FLAG_USER == 0) { if !function.is_supervisor() && (mapping & MAPPING_FLAG_USER == 0) {
if print_debug { if print_debug {
println!("Page not user accessible"); println!("Page not user accessible");