Changeset 108828 in vbox

Timestamp:

Apr 2, 2025 9:40:24 AM (2 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168274

Message:

VMM/GIC: bugref:10877 GITS work-in-progress. GITS_CREADR register access.

File:

• trunk/src/VBox/VMM/VMMAll/GITSAll.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/GITSAll.cpp

@@ -44 +44 @@
 /** The current GITS saved state version. */
 #define GITS_SAVED_STATE_VERSION                        1
+
+/** Gets whether the given register offset is within the specified range. */
 #define GITS_IS_REG_IN_RANGE(a_offReg, a_offFirst, a_cbRegion)    ((uint32_t)(a_offReg) - (a_offFirst) < (a_cbRegion))
 
@@ -107 +109 @@
 {
     Assert(cb == 4 || cb == 8);
+    RT_NOREF(cb);
 
     /*
@@ -112 +115 @@
      */
     uint64_t uReg;
-    if (GITS_IS_REG_IN_RANGE(offReg, GITS_CTRL_REG_BASER_OFF_FIRST,  GITS_CTRL_REG_BASER_RANGE_SIZE))
+    if (GITS_IS_REG_IN_RANGE(offReg, GITS_CTRL_REG_BASER_OFF_FIRST, GITS_CTRL_REG_BASER_RANGE_SIZE))
     {
         uint16_t const cbReg  = sizeof(uint64_t);
         uint16_t const idxReg = (offReg - GITS_CTRL_REG_BASER_OFF_FIRST) / cbReg;
-        if (!(offReg & 7))
-        {
-            if (cb == 8)
-                uReg = pGitsDev->aItsTableRegs[idxReg].u;
-            else
-                uReg = pGitsDev->aItsTableRegs[idxReg].s.Lo;
-        }
-        else
-        {
-            Assert(cb == 4);
-            uReg = pGitsDev->aItsTableRegs[idxReg].s.Hi;
-        }
+        uReg = pGitsDev->aItsTableRegs[idxReg].u >> ((offReg & 7) << 3 /* to bits */);
         return uReg;
     }
@@ -193 +185 @@
             break;
 
+        case GITS_CTRL_REG_CREADR_OFF:
+            uReg = pGitsDev->uCmdReadReg;
+            break;
+
+        case GITS_CTRL_REG_CREADR_OFF + 4:
+            uReg = 0;   /* Upper 32-bits are reserved, MBZ. */
+            break;
+
         default:
             AssertReleaseMsgFailed(("offReg=%#x (%s)\n", offReg, gitsGetCtrlRegDescription(offReg)));