From 3851109a0a8cc56dda3edec775cfa37f72faacc9 Mon Sep 17 00:00:00 2001
From: Ash Wolf <ninji@wuffs.org>
Date: Fri, 20 Dec 2019 22:25:05 +0000
Subject: [PATCH] add physical address display to memory viewer

---
 README.md             |  2 ++
 WindQt/mainwindow.cpp |  2 ++
 WindQt/mainwindow.ui  | 79 +++++++++++++++++++++++--------------------
 3 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index c8428f4..afe5db4 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,8 @@ Resources
 
 Special thanks to [PsiLinux/OpenPsion](http://linux-7110.sourceforge.net/index.shtml) for providing an avenue to learn about the hardware definitions (registers, etc).
 
+More information on the hardware is available in the NetBSD port: http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/epoc32/?only_with_tag=MAIN
+
 The EPOC C++ SDK is available here: https://web.archive.org/web/20071010101808/http://www.psionteklogix.com/teknet/pdk/netpad-pdk/epoc_downloads.htm
 
 The ARM variant used in the 5mx is documented here: http://infocenter.arm.com/help/topic/com.arm.doc.ddi0033d/DDI0033D_710a_prelim_ds.pdf
diff --git a/WindQt/mainwindow.cpp b/WindQt/mainwindow.cpp
index 95168c0..b273ab9 100644
--- a/WindQt/mainwindow.cpp
+++ b/WindQt/mainwindow.cpp
@@ -273,6 +273,8 @@ void MainWindow::updateMemory()
     uint32_t virtBase = ui->memoryViewAddress->text().toUInt(nullptr, 16) & ~0xFF;
     uint32_t physBase = emu->virtToPhys(virtBase);
     bool ok = (physBase != 0xFFFFFFFF) && emu->isPhysAddressValid(physBase);
+    if (ok && (virtBase != physBase))
+        ui->physicalAddressLabel->setText(QStringLiteral("Physical: %1").arg(physBase, 8, 16, QLatin1Char('0')));
 
     uint8_t block[0x100];
     if (ok) {
diff --git a/WindQt/mainwindow.ui b/WindQt/mainwindow.ui
index 402a0aa..7ddbdd5 100644
--- a/WindQt/mainwindow.ui
+++ b/WindQt/mainwindow.ui
@@ -133,6 +133,19 @@
           </property>
          </widget>
         </item>
+        <item row="3" column="5">
+         <spacer name="verticalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
         <item row="1" column="5">
          <widget class="QToolButton" name="memorySub4">
           <property name="text">
@@ -154,6 +167,18 @@
           </property>
          </widget>
         </item>
+        <item row="4" column="0" colspan="13">
+         <widget class="QLabel" name="memoryViewLabel">
+          <property name="font">
+           <font>
+            <family>Courier New</family>
+           </font>
+          </property>
+          <property name="text">
+           <string>TextLabel</string>
+          </property>
+         </widget>
+        </item>
         <item row="2" column="4">
          <widget class="QToolButton" name="memoryAdd1">
           <property name="text">
@@ -161,6 +186,13 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="10">
+         <widget class="QLabel" name="physicalAddressLabel">
+          <property name="text">
+           <string>Physical: XXXXXXXX</string>
+          </property>
+         </widget>
+        </item>
         <item row="2" column="7">
          <widget class="QToolButton" name="memoryAdd100">
           <property name="text">
@@ -168,33 +200,7 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="9">
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="3" column="5">
-         <spacer name="verticalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="0" column="10" rowspan="3">
+        <item row="0" column="12" rowspan="3">
          <widget class="QGroupBox" name="groupBox_2">
           <property name="title">
            <string>Write</string>
@@ -220,17 +226,18 @@
           </layout>
          </widget>
         </item>
-        <item row="4" column="0" colspan="11">
-         <widget class="QLabel" name="memoryViewLabel">
-          <property name="font">
-           <font>
-            <family>Courier New</family>
-           </font>
+        <item row="0" column="11">
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
           </property>
-          <property name="text">
-           <string>TextLabel</string>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
           </property>
-         </widget>
+         </spacer>
         </item>
        </layout>
       </widget>