Changeset 97358 in vbox

Timestamp:

Oct 31, 2022 11:14:44 PM (2 years ago)

Author:

vboxsync

Message:

VMM/IEM: Made all the IEM_MC_*_AND_FINISH macros return. bugref:9898

Location:

trunk/src/VBox/VMM/include

Files:

• IEMInline.h (modified) (3 diffs)
• IEMMc.h (modified) (1 diff)

trunk/src/VBox/VMM/include/IEMInline.h

@@ -1614 +1614 @@
  * @param   cbInstr             The number of bytes to add.
  */
-DECLINLINE(void) iemRegAddToRipAndClearRF(PVMCPUCC pVCpu, uint8_t cbInstr)
+DECLINLINE(VBOXSTRICTRC) iemRegAddToRipAndClearRF(PVMCPUCC pVCpu, uint8_t cbInstr)
 {
     /*
@@ -1641 +1641 @@
     AssertCompile(CPUMCTX_INHIBIT_SHADOW < UINT32_MAX);
     pVCpu->cpum.GstCtx.eflags.uBoth &= ~(X86_EFL_RF | CPUMCTX_INHIBIT_SHADOW);
+
+    return VINF_SUCCESS;
 }
 
@@ -1649 +1651 @@
  * @param   pVCpu               The cross context virtual CPU structure of the calling thread.
  */
-DECLINLINE(void) iemRegUpdateRipAndClearRF(PVMCPUCC pVCpu)
+DECLINLINE(VBOXSTRICTRC) iemRegUpdateRipAndClearRF(PVMCPUCC pVCpu)
 {
     return iemRegAddToRipAndClearRF(pVCpu, IEM_GET_INSTR_LEN(pVCpu));

trunk/src/VBox/VMM/include/IEMMc.h

@@ -53 +53 @@
 
 
-/** Advances RIP and finishes the instruction.
- * This may include raising debug exceptions and such.
- * @todo Make this be the return point, so we can get unreachable code erros
- *       if not the last MC statement. */
-#define IEM_MC_ADVANCE_RIP_AND_FINISH()                 iemRegUpdateRipAndClearRF(pVCpu)
-/** Tries to set RIP (may trigger \#GP) and finishes the instruction. */
-#define IEM_MC_REL_JMP_S8_AND_FINISH(a_i8)              IEM_MC_RETURN_ON_FAILURE(iemRegRipRelativeJumpS8(pVCpu, a_i8))
-/** Tries to set RIP (may trigger \#GP) and finishes the instruction. */
-#define IEM_MC_REL_JMP_S16_AND_FINISH(a_i16)            IEM_MC_RETURN_ON_FAILURE(iemRegRipRelativeJumpS16(pVCpu, a_i16))
-/** Tries to set RIP (may trigger \#GP) and finishes the instruction. */
-#define IEM_MC_REL_JMP_S32_AND_FINISH(a_i32)            IEM_MC_RETURN_ON_FAILURE(iemRegRipRelativeJumpS32(pVCpu, a_i32))
-/** Tries to set RIP (may trigger \#GP) and finishes the instruction. */
-#define IEM_MC_SET_RIP_U16_AND_FINISH(a_u16NewIP)       IEM_MC_RETURN_ON_FAILURE(iemRegRipJump((pVCpu), (a_u16NewIP)))
-/** Tries to set RIP (may trigger \#GP) and finishes the instruction. */
-#define IEM_MC_SET_RIP_U32_AND_FINISH(a_u32NewIP)       IEM_MC_RETURN_ON_FAILURE(iemRegRipJump((pVCpu), (a_u32NewIP)))
-/** Tries to set RIP (may trigger \#GP) and finishes the instruction. */
-#define IEM_MC_SET_RIP_U64_AND_FINISH(a_u64NewIP)       IEM_MC_RETURN_ON_FAILURE(iemRegRipJump((pVCpu), (a_u64NewIP)))
+/** Advances RIP, finishes the instruction and returns.
+ * This may include raising debug exceptions and such. */
+#define IEM_MC_ADVANCE_RIP_AND_FINISH()                 return iemRegUpdateRipAndClearRF(pVCpu)
+/** Sets RIP (may trigger \#GP), finishes the instruction and returns. */
+#define IEM_MC_REL_JMP_S8_AND_FINISH(a_i8)              return iemRegRipRelativeJumpS8(pVCpu, (a_i8))
+/** Sets RIP (may trigger \#GP), finishes the instruction and returns. */
+#define IEM_MC_REL_JMP_S16_AND_FINISH(a_i16)            return iemRegRipRelativeJumpS16(pVCpu, (a_i16))
+/** Sets RIP (may trigger \#GP), finishes the instruction and returns. */
+#define IEM_MC_REL_JMP_S32_AND_FINISH(a_i32)            return iemRegRipRelativeJumpS32(pVCpu, (a_i32))
+/** Sets RIP (may trigger \#GP), finishes the instruction and returns. */
+#define IEM_MC_SET_RIP_U16_AND_FINISH(a_u16NewIP)       return iemRegRipJump((pVCpu), (a_u16NewIP))
+/** Sets RIP (may trigger \#GP), finishes the instruction and returns. */
+#define IEM_MC_SET_RIP_U32_AND_FINISH(a_u32NewIP)       return iemRegRipJump((pVCpu), (a_u32NewIP))
+/** Sets RIP (may trigger \#GP), finishes the instruction and returns. */
+#define IEM_MC_SET_RIP_U64_AND_FINISH(a_u64NewIP)       return iemRegRipJump((pVCpu), (a_u64NewIP))
 
 #define IEM_MC_RAISE_DIVIDE_ERROR()                     return iemRaiseDivideError(pVCpu)