Changeset 100108 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jun 7, 2023 8:05:13 PM (21 months ago)

Author:

vboxsync

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

157801

Message:

*: Fix build issues when setting VBOX_WITH_WARNINGS_AS_ERRORS=1 on darwin.arm64 and make it a default, bugref:10469

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllRegs-armv8.cpp (modified) (5 diffs)
• GICAll.cpp (modified) (3 diffs)
• GIMAll.cpp (modified) (4 diffs)
• IEMAllCImpl.cpp (modified) (2 diffs)
• IOMAllMmioNew.cpp (modified) (2 diffs)
• PDMAll.cpp (modified) (1 diff)
• PGMAllPool.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs-armv8.cpp

@@ -200 +200 @@
     AssertReturnVoid(pcLinearAddrWidth);
     AssertReleaseFailed();
+    RT_NOREF(pVM);
 }
 
@@ -320 +321 @@
     CPUM_INT_ASSERT_NOT_EXTRN(pVCpu, CPUMCTX_EXTRN_PC | CPUMCTX_EXTRN_PSTATE);
     AssertReleaseFailed();
+    RT_NOREF(pVCpu);
     return CPUMMODE_REAL;
 }
@@ -334 +336 @@
     CPUM_INT_ASSERT_NOT_EXTRN(pVCpu, CPUMCTX_EXTRN_PC | CPUMCTX_EXTRN_PSTATE);
     AssertReleaseFailed();
+    RT_NOREF(pVCpu);
     return 16;
 }
@@ -342 +345 @@
     CPUM_INT_ASSERT_NOT_EXTRN(pVCpu, CPUMCTX_EXTRN_PC | CPUMCTX_EXTRN_PSTATE);
     AssertReleaseFailed();
+    RT_NOREF(pVCpu);
     return DISCPUMODE_16BIT;
 }
@@ -396 +400 @@
         CASE_RET_STR(kCpumMicroarch_Apple_M1);
 #undef CASE_RET_STR
+        default:
+            break;
     }
 

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

@@ -405 +405 @@
     PGICDEV pThis  = PDMDEVINS_2_DATA(pDevIns, PGICDEV);
     PVMCC    pVM   = PDMDevHlpGetVM(pDevIns);
+
+    if (offReg >= GIC_DIST_REG_IROUTERn_OFF_START && offReg <= GIC_DIST_REG_IROUTERn_OFF_LAST)
+    {
+        /** @todo Ignored for now, probably make this a MMIO2 region as it begins on 0x6000, see 12.9.22 of the GICv3 architecture
+         * reference manual. */
+        return VINF_SUCCESS;
+    }
 
     VBOXSTRICTRC rcStrict = VINF_SUCCESS;
@@ -505 +512 @@
         case GIC_DIST_REG_INMIn_OFF_START:
             AssertReleaseFailed();
-            break;
-        case GIC_DIST_REG_IROUTERn_OFF_START ... GIC_DIST_REG_IROUTERn_OFF_LAST: /* Only 32 lines for now. */
-            /** @todo Ignored for now, probably make this a MMIO2 region as it begins on 0x6000, see 12.9.22 of the GICv3 architecture
-             * reference manual. */
             break;
         default:
@@ -1111 +1114 @@
     LogFlowFunc(("GIC%u\n", pVCpu->idCpu));
     VMCPU_ASSERT_EMT_OR_NOT_RUNNING(pVCpu);
+    RT_NOREF(pVCpu);
 }
 

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

@@ -155 +155 @@
 VMM_INT_DECL(VBOXSTRICTRC) GIMHypercall(PVMCPUCC pVCpu, PCPUMCTX pCtx)
 {
+#if defined(VBOX_VMM_TARGET_ARMV8)
+    RT_NOREF(pCtx);
+#endif
+
     PVMCC pVM = pVCpu->CTX_SUFF(pVM);
     VMCPU_ASSERT_EMT(pVCpu);
@@ -207 +211 @@
 VMM_INT_DECL(VBOXSTRICTRC) GIMHypercallEx(PVMCPUCC pVCpu, PCPUMCTX pCtx, unsigned uDisOpcode, uint8_t cbInstr)
 {
+#if defined(VBOX_VMM_TARGET_ARMV8)
+    RT_NOREF(pCtx, uDisOpcode, cbInstr);
+#endif
+
     PVMCC pVM = pVCpu->CTX_SUFF(pVM);
     VMCPU_ASSERT_EMT(pVCpu);
@@ -243 +251 @@
 VMM_INT_DECL(VBOXSTRICTRC) GIMExecHypercallInstr(PVMCPUCC pVCpu, PCPUMCTX pCtx, uint8_t *pcbInstr)
 {
+#if defined(VBOX_VMM_TARGET_ARMV8)
+    RT_NOREF(pCtx);
+#endif
+
     PVMCC pVM = pVCpu->CTX_SUFF(pVM);
     VMCPU_ASSERT_EMT(pVCpu);
@@ -365 +377 @@
 VMM_INT_DECL(VBOXSTRICTRC) GIMXcptUD(PVMCPUCC pVCpu, PCPUMCTX pCtx, PDISSTATE pDis, uint8_t *pcbInstr)
 {
+#if defined(VBOX_VMM_TARGET_ARMV8)
+    RT_NOREF(pCtx, pDis, pcbInstr);
+#endif
+
     PVMCC pVM = pVCpu->CTX_SUFF(pVM);
     Assert(GIMIsEnabled(pVM));

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

@@ -7508 +7508 @@
     }
 #endif
-#if defined(VBOX_WITH_NESTED_HWVIRT_VMX) || defined(VBOX_WITH_NESTED_HWVIRT_SVM)
+#if !defined(VBOX_WITH_NESTED_HWVIRT_VMX) && !defined(VBOX_WITH_NESTED_HWVIRT_SVM)
     RT_NOREF(bImmAndEffAddrMode);
 #endif
@@ -7624 +7624 @@
     }
 #endif
-#if defined(VBOX_WITH_NESTED_HWVIRT_VMX) || defined(VBOX_WITH_NESTED_HWVIRT_SVM)
+#if !defined(VBOX_WITH_NESTED_HWVIRT_VMX) && !defined(VBOX_WITH_NESTED_HWVIRT_SVM)
     RT_NOREF(bImmAndEffAddrMode);
 #endif

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

@@ -1088 +1088 @@
 #if defined(VBOX_VMM_TARGET_ARMV8)
     /** @todo NEM: MMIO page aliasing. */
+    RT_NOREF(pVM, hRegion, offRegion, hMmio2, offMmio2);
     return VINF_SUCCESS;    /* ignore */ /** @todo return some indicator if we fail here */
 #else
@@ -1258 +1259 @@
 #if defined(VBOX_VMM_TARGET_ARMV8)
     /** @todo NEM: MMIO page aliasing. */
+    RT_NOREF(pVM, hRegion);
     return VINF_SUCCESS;    /* ignore */ /** @todo return some indicator if we fail here */
 #else

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

@@ -150 +150 @@
 #ifdef VBOX_VMM_TARGET_ARMV8
     int rc = VINF_SUCCESS;
-    GICSpiSet(pVM, u8Level, u8Level == PDM_IRQ_LEVEL_HIGH ? true : false);
+    GICSpiSet(pVM, u8Irq, u8Level == PDM_IRQ_LEVEL_HIGH ? true : false);
 #else
     int rc = VERR_PDM_NO_PIC_INSTANCE;

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

@@ -2164 +2164 @@
 static int pgmPoolCacheFreeOne(PPGMPOOL pPool, uint16_t iUser)
 {
+#ifndef VBOX_VMM_TARGET_ARMV8
     const PVMCC pVM = pPool->CTX_SUFF(pVM);
+#endif
     Assert(pPool->iAgeHead != pPool->iAgeTail); /* We shouldn't be here if there < 2 cached entries! */
     STAM_COUNTER_INC(&pPool->StatCacheFreeUpOne);