1 files changed, 9 insertions, 2 deletions

diff --git a/nvdebug.h b/nvdebug.h
index fcc6cff..67f2111 100644
--- a/nvdebug.h
+++ b/nvdebug.h
@@ -935,7 +935,6 @@ static inline const char *pd_target_to_text(enum PD_TARGET t) {
 //
 // V3 introduced with Hopper, but Hopper and Blackwell also support V2
 //
-// FIXME: This structure is 32 bits, but PDE/PTEs are actually 64 bits!
 typedef union {
         // Page Directory Entry (PDE)
         struct {
@@ -943,6 +942,7 @@ typedef union {
                 bool is_volatile:1;
                  uint32_t padding1:4;
                 uint32_t addr:24;
+                 uint32_t __unused1;
         } __attribute__((packed));
         // Page Table Entry (PTE)
         struct {
@@ -954,8 +954,15 @@ typedef union {
                 bool is_readonly:1;
                 bool atomics_disabled:1;
                  uint32_t __addr:24;
+                 uint32_t __unused2;
         } __attribute__((packed));
-        uint32_t raw;
+        // For wide addresses in PTEs or PDEs; only used if target is SYS_MEM
+        struct {
+                 uint32_t __overlap:8;
+                uint64_t addr_w:46;
+                 uint32_t __unused3:10;
+        } __attribute__((packed));
+        uint64_t raw_w;
 } page_dir_entry_t;
 
 // Page Directory Entry/Page Table Entry V1 type