diff --git a/hw/xbox/nv2a/nv2a.c b/hw/xbox/nv2a/nv2a.c
index 7b2131b8a3..f9cf0889bf 100644
--- a/hw/xbox/nv2a/nv2a.c
+++ b/hw/xbox/nv2a/nv2a.c
@@ -135,7 +135,7 @@ DEFINE_PROTO(pcrtc)
 DEFINE_PROTO(prmcio)
 DEFINE_PROTO(pramdac)
 DEFINE_PROTO(prmdio)
-DEFINE_PROTO(pramin)
+// DEFINE_PROTO(pramin)
 DEFINE_PROTO(user)
 
 #undef DEFINE_PROTO
diff --git a/hw/xbox/nv2a/nv2a_stubs.c b/hw/xbox/nv2a/nv2a_stubs.c
index c2c5ec46ac..f503ff4a7f 100644
--- a/hw/xbox/nv2a/nv2a_stubs.c
+++ b/hw/xbox/nv2a/nv2a_stubs.c
@@ -19,100 +19,29 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-uint64_t prma_read(void *opaque,
-                                  hwaddr addr, unsigned int size)
-{
-    reg_log_read(NV_PRMA, addr, 0);
-    return 0;
-}
-void prma_write(void *opaque, hwaddr addr,
-                               uint64_t val, unsigned int size)
-{
-    reg_log_write(NV_PRMA, addr, val);
-}
+#define DEFINE_STUB(name, region_id) \
+    uint64_t name ## _read(void *opaque, \
+                           hwaddr addr, \
+                           unsigned int size) \
+    { \
+        reg_log_read(region_id, addr, 0); \
+        return 0; \
+    } \
+    void name ## _write(void *opaque, \
+                        hwaddr addr, \
+                        uint64_t val, \
+                        unsigned int size) \
+    { \
+        reg_log_write(region_id, addr, val); \
+    } \
 
-uint64_t pcounter_read(void *opaque,
-                                  hwaddr addr, unsigned int size)
-{
-    reg_log_read(NV_PCOUNTER, addr, 0);
-    return 0;
-}
-void pcounter_write(void *opaque, hwaddr addr,
-                               uint64_t val, unsigned int size)
-{
-    reg_log_write(NV_PCOUNTER, addr, val);
-}
+DEFINE_STUB(prma, NV_PRMA)
+DEFINE_STUB(pcounter, NV_PCOUNTER)
+DEFINE_STUB(pvpe, NV_PVPE)
+DEFINE_STUB(ptv, NV_PTV)
+DEFINE_STUB(prmfb, NV_PRMFB)
+DEFINE_STUB(prmdio, NV_PRMDIO)
+DEFINE_STUB(pstraps, NV_PSTRAPS)
+// DEFINE_STUB(pramin, NV_PRAMIN)
 
-uint64_t pvpe_read(void *opaque,
-                                  hwaddr addr, unsigned int size)
-{
-    reg_log_read(NV_PVPE, addr, 0);
-    return 0;
-}
-void pvpe_write(void *opaque, hwaddr addr,
-                               uint64_t val, unsigned int size)
-{
-    reg_log_write(NV_PVPE, addr, val);
-}
-
-uint64_t ptv_read(void *opaque,
-                                  hwaddr addr, unsigned int size)
-{
-    reg_log_read(NV_PTV, addr, 0);
-    return 0;
-}
-void ptv_write(void *opaque, hwaddr addr,
-                               uint64_t val, unsigned int size)
-{
-    reg_log_write(NV_PTV, addr, val);
-}
-
-uint64_t prmfb_read(void *opaque,
-                                  hwaddr addr, unsigned int size)
-{
-    reg_log_read(NV_PRMFB, addr, 0);
-    return 0;
-}
-void prmfb_write(void *opaque, hwaddr addr,
-                               uint64_t val, unsigned int size)
-{
-    reg_log_write(NV_PRMFB, addr, val);
-}
-
-uint64_t prmdio_read(void *opaque,
-                                  hwaddr addr, unsigned int size)
-{
-    reg_log_read(NV_PRMDIO, addr, 0);
-    return 0;
-}
-void prmdio_write(void *opaque, hwaddr addr,
-                               uint64_t val, unsigned int size)
-{
-    reg_log_write(NV_PRMDIO, addr, val);
-}
-
-uint64_t pstraps_read(void *opaque,
-                                  hwaddr addr, unsigned int size)
-{
-    reg_log_read(NV_PSTRAPS, addr, 0);
-    return 0;
-}
-void pstraps_write(void *opaque, hwaddr addr,
-                               uint64_t val, unsigned int size)
-{
-    reg_log_write(NV_PSTRAPS, addr, val);
-}
-
-/* PRAMIN - RAMIN access */
-/*
-uint64_t pramin_read(void *opaque,
-                                 hwaddr addr, unsigned int size)
-{
-    NV2A_DPRINTF("nv2a PRAMIN: read [0x%" HWADDR_PRIx "] -> 0x%" HWADDR_PRIx "\n", addr, r);
-    return 0;
-}
-void pramin_write(void *opaque, hwaddr addr,
-                              uint64_t val, unsigned int size)
-{
-    NV2A_DPRINTF("nv2a PRAMIN: [0x%" HWADDR_PRIx "] = 0x%02llx\n", addr, val);
-}*/
+#undef DEFINE_STUB