Update

[l4.git] / 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 ac2c8a4bc60c45f92dfa8ff26b04b44af39446d1..c02f1856030fddc6de872003887b324fe2e92268 100644 (file)
--- 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');
 }