X-Git-Url: https://rtime.felk.cvut.cz/gitweb/l4.git/blobdiff_plain/8fe9942cde59835eb3c3c6936d866dd3305582ef..003b628647705666de261350195da72a38f2c4d2:/kernel/fiasco/src/jdb/ia32/64/jdb_ptab-amd64.cpp diff --git a/kernel/fiasco/src/jdb/ia32/64/jdb_ptab-amd64.cpp b/kernel/fiasco/src/jdb/ia32/64/jdb_ptab-amd64.cpp index ac2c8a4bc..c02f18560 100644 --- a/kernel/fiasco/src/jdb/ia32/64/jdb_ptab-amd64.cpp +++ b/kernel/fiasco/src/jdb/ia32/64/jdb_ptab-amd64.cpp @@ -24,8 +24,10 @@ Jdb_ptab::print_entry(Pdir::Pte_ptr const &entry) printf((phys >> 20) > 0xFF ? " %03lx/2" : " %02lx/2", phys >> 20); else + // truncates the upper 4bit of the physical address, + // which are attributes anyways printf((phys >> Config::PAGE_SHIFT) > 0xFFFF - ? "%13lx" : " %04lx", phys >> Config::PAGE_SHIFT); + ? "%12lx" : " %04lx", phys >> Config::PAGE_SHIFT); putchar(((cur_pt_level >= Pdir::Depth || entry.is_leaf()) && (*entry.pte & Pt_entry::Cpu_global)) ? '+' : '-'); @@ -36,6 +38,7 @@ Jdb_ptab::print_entry(Pdir::Pte_ptr const &entry) putchar(*entry.pte & Pt_entry::User ? (*entry.pte & Pt_entry::Writable) ? 'w' : 'r' : (*entry.pte & Pt_entry::Writable) ? 'W' : 'R'); + putchar(*entry.pte & Pt_entry::XD ? '-' : 'x'); }