VirtualBox

Ignore:
Timestamp:
Feb 18, 2025 9:14:21 AM (2 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
167594
Message:

VMM/IEM: s/IEM_MC_SET_RIP_U\(16|32|64\)_AND_FINISH/IEM_MC_IND_JMP_U\1_AND_FINISH/g jiraref:VBP-1531

Location:
trunk/src/VBox/VMM/VMMAll/target-x86
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/VMM/VMMAll/target-x86/IEMAllInstOneByte-x86.cpp.h

    r108267 r108269  
    1529615296                IEM_MC_LOCAL(uint16_t, u16Target);
    1529715297                IEM_MC_FETCH_GREG_U16(u16Target, IEM_GET_MODRM_RM(pVCpu, bRm));
    15298                 IEM_MC_SET_RIP_U16_AND_FINISH(u16Target);
     15298                IEM_MC_IND_JMP_U16_AND_FINISH(u16Target);
    1529915299                IEM_MC_END();
    1530015300                break;
    … …  
    1530515305                IEM_MC_LOCAL(uint32_t, u32Target);
    1530615306                IEM_MC_FETCH_GREG_U32(u32Target, IEM_GET_MODRM_RM(pVCpu, bRm));
    15307                 IEM_MC_SET_RIP_U32_AND_FINISH(u32Target);
     15307                IEM_MC_IND_JMP_U32_AND_FINISH(u32Target);
    1530815308                IEM_MC_END();
    1530915309                break;
    … …  
    1531415314                IEM_MC_LOCAL(uint64_t, u64Target);
    1531515315                IEM_MC_FETCH_GREG_U64(u64Target, IEM_GET_MODRM_RM(pVCpu, bRm));
    15316                 IEM_MC_SET_RIP_U64_AND_FINISH(u64Target);
     15316                IEM_MC_IND_JMP_U64_AND_FINISH(u64Target);
    1531715317                IEM_MC_END();
    1531815318                break;
    … …  
    1533315333                IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
    1533415334                IEM_MC_FETCH_MEM_U16(u16Target, pVCpu->iem.s.iEffSeg, GCPtrEffSrc);
    15335                 IEM_MC_SET_RIP_U16_AND_FINISH(u16Target);
     15335                IEM_MC_IND_JMP_U16_AND_FINISH(u16Target);
    1533615336                IEM_MC_END();
    1533715337                break;
    … …  
    1534415344                IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
    1534515345                IEM_MC_FETCH_MEM_U32(u32Target, pVCpu->iem.s.iEffSeg, GCPtrEffSrc);
    15346                 IEM_MC_SET_RIP_U32_AND_FINISH(u32Target);
     15346                IEM_MC_IND_JMP_U32_AND_FINISH(u32Target);
    1534715347                IEM_MC_END();
    1534815348                break;
    … …  
    1535515355                IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
    1535615356                IEM_MC_FETCH_MEM_U64(u64Target, pVCpu->iem.s.iEffSeg, GCPtrEffSrc);
    15357                 IEM_MC_SET_RIP_U64_AND_FINISH(u64Target);
     15357                IEM_MC_IND_JMP_U64_AND_FINISH(u64Target);
    1535815358                IEM_MC_END();
    1535915359                break;

  • trunk/src/VBox/VMM/VMMAll/target-x86/IEMAllN8veLiveness-x86.h

    r108267 r108269  
    348348#define IEM_MC_REL_JMP_S32_AND_FINISH_THREADED_PC64_WITH_FLAGS(a_i32, a_cbInstr, a_rcNormal)                        IEM_LIVENESS_PC64_JMP_WITH_FLAGS()
    349349#define IEM_MC_REL_JMP_S32_AND_FINISH_THREADED_PC64_INTRAPG_WITH_FLAGS(a_i32, a_cbInstr, a_rcNormal)                IEM_LIVENESS_PC64_INTRAPG_JMP_WITH_FLAGS()
    350 #define IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC16(a_u16NewIP)                                                     IEM_LIVENESS_PC16_JMP_NO_FLAGS()
    351 #define IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC32(a_u16NewIP)                                                     IEM_LIVENESS_PC32_JMP_NO_FLAGS()
    352 #define IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC64(a_u16NewIP)                                                     IEM_LIVENESS_PC64_JMP_NO_FLAGS()
    353 #define IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC16_WITH_FLAGS(a_u16NewIP)                                          IEM_LIVENESS_PC16_JMP_WITH_FLAGS()
    354 #define IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC32_WITH_FLAGS(a_u16NewIP)                                          IEM_LIVENESS_PC32_JMP_WITH_FLAGS()
    355 #define IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC64_WITH_FLAGS(a_u16NewIP)                                          IEM_LIVENESS_PC64_JMP_WITH_FLAGS()
    356 #define IEM_MC_SET_RIP_U32_AND_FINISH_THREADED_PC32(a_u32NewEIP)                                                    IEM_LIVENESS_PC32_JMP_NO_FLAGS()
    357 #define IEM_MC_SET_RIP_U32_AND_FINISH_THREADED_PC64(a_u32NewEIP)                                                    IEM_LIVENESS_PC64_JMP_NO_FLAGS()
    358 #define IEM_MC_SET_RIP_U32_AND_FINISH_THREADED_PC32_WITH_FLAGS(a_u32NewEIP)                                         IEM_LIVENESS_PC32_JMP_WITH_FLAGS()
    359 #define IEM_MC_SET_RIP_U32_AND_FINISH_THREADED_PC64_WITH_FLAGS(a_u32NewEIP)                                         IEM_LIVENESS_PC64_JMP_WITH_FLAGS()
    360 #define IEM_MC_SET_RIP_U64_AND_FINISH_THREADED_PC64(a_u32NewEIP)                                                    IEM_LIVENESS_PC64_JMP_NO_FLAGS()
    361 #define IEM_MC_SET_RIP_U64_AND_FINISH_THREADED_PC64_WITH_FLAGS(a_u32NewEIP)                                         IEM_LIVENESS_PC64_JMP_WITH_FLAGS()
     350#define IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC16(a_u16NewIP)                                                     IEM_LIVENESS_PC16_JMP_NO_FLAGS()
     351#define IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC32(a_u16NewIP)                                                     IEM_LIVENESS_PC32_JMP_NO_FLAGS()
     352#define IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC64(a_u16NewIP)                                                     IEM_LIVENESS_PC64_JMP_NO_FLAGS()
     353#define IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC16_WITH_FLAGS(a_u16NewIP)                                          IEM_LIVENESS_PC16_JMP_WITH_FLAGS()
     354#define IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC32_WITH_FLAGS(a_u16NewIP)                                          IEM_LIVENESS_PC32_JMP_WITH_FLAGS()
     355#define IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC64_WITH_FLAGS(a_u16NewIP)                                          IEM_LIVENESS_PC64_JMP_WITH_FLAGS()
     356#define IEM_MC_IND_JMP_U32_AND_FINISH_THREADED_PC32(a_u32NewEIP)                                                    IEM_LIVENESS_PC32_JMP_NO_FLAGS()
     357#define IEM_MC_IND_JMP_U32_AND_FINISH_THREADED_PC64(a_u32NewEIP)                                                    IEM_LIVENESS_PC64_JMP_NO_FLAGS()
     358#define IEM_MC_IND_JMP_U32_AND_FINISH_THREADED_PC32_WITH_FLAGS(a_u32NewEIP)                                         IEM_LIVENESS_PC32_JMP_WITH_FLAGS()
     359#define IEM_MC_IND_JMP_U32_AND_FINISH_THREADED_PC64_WITH_FLAGS(a_u32NewEIP)                                         IEM_LIVENESS_PC64_JMP_WITH_FLAGS()
     360#define IEM_MC_IND_JMP_U64_AND_FINISH_THREADED_PC64(a_u32NewEIP)                                                    IEM_LIVENESS_PC64_JMP_NO_FLAGS()
     361#define IEM_MC_IND_JMP_U64_AND_FINISH_THREADED_PC64_WITH_FLAGS(a_u32NewEIP)                                         IEM_LIVENESS_PC64_JMP_WITH_FLAGS()
    362362
    363363#define IEM_MC_REL_CALL_S16_AND_FINISH_THREADED_PC16(a_i16, a_cbInstr)                      do { IEM_LIVENESS_PC16_JMP_NO_FLAGS();   IEM_LIVENESS_STACK(); } while (0)

  • trunk/src/VBox/VMM/VMMAll/target-x86/IEMAllN8veRecompFuncs-x86.h

    r108267 r108269  
    14091409
    14101410/*********************************************************************************************************************************
    1411 *   Emitters for changing PC/RIP/EIP/IP with a indirect jump (IEM_MC_SET_RIP_UXX_AND_FINISH).                                    *
     1411*   Emitters for changing PC/RIP/EIP/IP with a indirect jump (IEM_MC_IND_JMP_UXX_AND_FINISH).                                    *
    14121412*********************************************************************************************************************************/
    14131413
    1414 /** Variant of IEM_MC_SET_RIP_U16_AND_FINISH for pre-386 targets. */
    1415 #define IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC16(a_u16NewIP) \
     1414/** Variant of IEM_MC_IND_JMP_U16_AND_FINISH for pre-386 targets. */
     1415#define IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC16(a_u16NewIP) \
    14161416    off = iemNativeEmitRipJumpNoFlags(pReNative, off, (a_u16NewIP), false /*f64Bit*/, pCallEntry->idxInstr, sizeof(uint16_t))
    14171417
    1418 /** Variant of IEM_MC_SET_RIP_U16_AND_FINISH for 386+ targets. */
    1419 #define IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC32(a_u16NewIP) \
     1418/** Variant of IEM_MC_IND_JMP_U16_AND_FINISH for 386+ targets. */
     1419#define IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC32(a_u16NewIP) \
    14201420    off = iemNativeEmitRipJumpNoFlags(pReNative, off, (a_u16NewIP), false /*f64Bit*/, pCallEntry->idxInstr, sizeof(uint16_t))
    14211421
    1422 /** Variant of IEM_MC_SET_RIP_U16_AND_FINISH for use in 64-bit code. */
    1423 #define IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC64(a_u16NewIP) \
     1422/** Variant of IEM_MC_IND_JMP_U16_AND_FINISH for use in 64-bit code. */
     1423#define IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC64(a_u16NewIP) \
    14241424    off = iemNativeEmitRipJumpNoFlags(pReNative, off, (a_u16NewIP),  true /*f64Bit*/, pCallEntry->idxInstr, sizeof(uint16_t))
    14251425
    1426 /** Variant of IEM_MC_SET_RIP_U16_AND_FINISH for pre-386 targets that checks and
     1426/** Variant of IEM_MC_IND_JMP_U16_AND_FINISH for pre-386 targets that checks and
    14271427 *  clears flags. */
    1428 #define IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC16_WITH_FLAGS(a_u16NewIP) \
    1429     IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC16(a_u16NewIP); \
     1428#define IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC16_WITH_FLAGS(a_u16NewIP) \
     1429    IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC16(a_u16NewIP); \
    14301430    off = iemNativeEmitFinishInstructionFlagsCheck(pReNative, off)
    14311431
    1432 /** Variant of IEM_MC_SET_RIP_U16_AND_FINISH for 386+ targets that checks and
     1432/** Variant of IEM_MC_IND_JMP_U16_AND_FINISH for 386+ targets that checks and
    14331433 *  clears flags. */
    1434 #define IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC32_WITH_FLAGS(a_u16NewIP) \
    1435     IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC32(a_u16NewIP); \
     1434#define IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC32_WITH_FLAGS(a_u16NewIP) \
     1435    IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC32(a_u16NewIP); \
    14361436    off = iemNativeEmitFinishInstructionFlagsCheck(pReNative, off)
    14371437
    1438 /** Variant of IEM_MC_SET_RIP_U16_AND_FINISH for use in 64-bit code that checks and
     1438/** Variant of IEM_MC_IND_JMP_U16_AND_FINISH for use in 64-bit code that checks and
    14391439 *  clears flags. */
    1440 #define IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC64_WITH_FLAGS(a_u16NewIP) \
    1441     IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC64(a_u16NewIP); \
     1440#define IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC64_WITH_FLAGS(a_u16NewIP) \
     1441    IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC64(a_u16NewIP); \
    14421442    off = iemNativeEmitFinishInstructionFlagsCheck(pReNative, off)
    14431443
    1444 #undef IEM_MC_SET_RIP_U16_AND_FINISH
    1445 
    1446 
    1447 /** Variant of IEM_MC_SET_RIP_U32_AND_FINISH for 386+ targets. */
    1448 #define IEM_MC_SET_RIP_U32_AND_FINISH_THREADED_PC32(a_u32NewEIP) \
     1444#undef IEM_MC_IND_JMP_U16_AND_FINISH
     1445
     1446
     1447/** Variant of IEM_MC_IND_JMP_U32_AND_FINISH for 386+ targets. */
     1448#define IEM_MC_IND_JMP_U32_AND_FINISH_THREADED_PC32(a_u32NewEIP) \
    14491449    off = iemNativeEmitRipJumpNoFlags(pReNative, off, (a_u32NewEIP), false /*f64Bit*/, pCallEntry->idxInstr, sizeof(uint32_t))
    14501450
    1451 /** Variant of IEM_MC_SET_RIP_U32_AND_FINISH for use in 64-bit code. */
    1452 #define IEM_MC_SET_RIP_U32_AND_FINISH_THREADED_PC64(a_u32NewEIP) \
     1451/** Variant of IEM_MC_IND_JMP_U32_AND_FINISH for use in 64-bit code. */
     1452#define IEM_MC_IND_JMP_U32_AND_FINISH_THREADED_PC64(a_u32NewEIP) \
    14531453    off = iemNativeEmitRipJumpNoFlags(pReNative, off, (a_u32NewEIP),  true /*f64Bit*/, pCallEntry->idxInstr, sizeof(uint32_t))
    14541454
    1455 /** Variant of IEM_MC_SET_RIP_U32_AND_FINISH for 386+ targets that checks and
     1455/** Variant of IEM_MC_IND_JMP_U32_AND_FINISH for 386+ targets that checks and
    14561456 *  clears flags. */
    1457 #define IEM_MC_SET_RIP_U32_AND_FINISH_THREADED_PC32_WITH_FLAGS(a_u32NewEIP) \
    1458     IEM_MC_SET_RIP_U32_AND_FINISH_THREADED_PC32(a_u32NewEIP); \
     1457#define IEM_MC_IND_JMP_U32_AND_FINISH_THREADED_PC32_WITH_FLAGS(a_u32NewEIP) \
     1458    IEM_MC_IND_JMP_U32_AND_FINISH_THREADED_PC32(a_u32NewEIP); \
    14591459    off = iemNativeEmitFinishInstructionFlagsCheck(pReNative, off)
    14601460
    1461 /** Variant of IEM_MC_SET_RIP_U32_AND_FINISH for use in 64-bit code that checks
     1461/** Variant of IEM_MC_IND_JMP_U32_AND_FINISH for use in 64-bit code that checks
    14621462 *  and clears flags. */
    1463 #define IEM_MC_SET_RIP_U32_AND_FINISH_THREADED_PC64_WITH_FLAGS(a_u32NewEIP) \
    1464     IEM_MC_SET_RIP_U32_AND_FINISH_THREADED_PC64(a_u32NewEIP); \
     1463#define IEM_MC_IND_JMP_U32_AND_FINISH_THREADED_PC64_WITH_FLAGS(a_u32NewEIP) \
     1464    IEM_MC_IND_JMP_U32_AND_FINISH_THREADED_PC64(a_u32NewEIP); \
    14651465    off = iemNativeEmitFinishInstructionFlagsCheck(pReNative, off)
    14661466
    1467 #undef IEM_MC_SET_RIP_U32_AND_FINISH
    1468 
    1469 
    1470 /** Variant of IEM_MC_SET_RIP_U64_AND_FINISH for use in 64-bit code. */
    1471 #define IEM_MC_SET_RIP_U64_AND_FINISH_THREADED_PC64(a_u64NewEIP) \
     1467#undef IEM_MC_IND_JMP_U32_AND_FINISH
     1468
     1469
     1470/** Variant of IEM_MC_IND_JMP_U64_AND_FINISH for use in 64-bit code. */
     1471#define IEM_MC_IND_JMP_U64_AND_FINISH_THREADED_PC64(a_u64NewEIP) \
    14721472    off = iemNativeEmitRipJumpNoFlags(pReNative, off, (a_u64NewEIP),  true /*f64Bit*/, pCallEntry->idxInstr, sizeof(uint64_t))
    14731473
    1474 /** Variant of IEM_MC_SET_RIP_U64_AND_FINISH for use in 64-bit code that checks
     1474/** Variant of IEM_MC_IND_JMP_U64_AND_FINISH for use in 64-bit code that checks
    14751475 *  and clears flags. */
    1476 #define IEM_MC_SET_RIP_U64_AND_FINISH_THREADED_PC64_WITH_FLAGS(a_u64NewEIP) \
    1477     IEM_MC_SET_RIP_U64_AND_FINISH_THREADED_PC64(a_u64NewEIP); \
     1476#define IEM_MC_IND_JMP_U64_AND_FINISH_THREADED_PC64_WITH_FLAGS(a_u64NewEIP) \
     1477    IEM_MC_IND_JMP_U64_AND_FINISH_THREADED_PC64(a_u64NewEIP); \
    14781478    off = iemNativeEmitFinishInstructionFlagsCheck(pReNative, off)
    14791479
    1480 #undef IEM_MC_SET_RIP_U64_AND_FINISH
     1480#undef IEM_MC_IND_JMP_U64_AND_FINISH
    14811481
    14821482

  • trunk/src/VBox/VMM/VMMAll/target-x86/IEMAllThrdFuncs-x86.cpp

    r108267 r108269  
    301301
    302302
    303 /** Variant of IEM_MC_SET_RIP_U16_AND_FINISH for pre-386 targets. */
    304 #define IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC16(a_u16NewIP) \
     303/** Variant of IEM_MC_IND_JMP_U16_AND_FINISH for pre-386 targets. */
     304#define IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC16(a_u16NewIP) \
    305305    return iemRegRipJumpU16AndFinishNoFlags((pVCpu), (a_u16NewIP))
    306306
    307 /** Variant of IEM_MC_SET_RIP_U16_AND_FINISH for 386+ targets. */
    308 #define IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC32(a_u16NewIP) \
     307/** Variant of IEM_MC_IND_JMP_U16_AND_FINISH for 386+ targets. */
     308#define IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC32(a_u16NewIP) \
    309309    return iemRegRipJumpU16AndFinishNoFlags((pVCpu), (a_u16NewIP))
    310310
    311 /** Variant of IEM_MC_SET_RIP_U16_AND_FINISH for use in 64-bit code. */
    312 #define IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC64(a_u16NewIP) \
     311/** Variant of IEM_MC_IND_JMP_U16_AND_FINISH for use in 64-bit code. */
     312#define IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC64(a_u16NewIP) \
    313313    return iemRegRipJumpU16AndFinishNoFlags((pVCpu), (a_u16NewIP))
    314314
    315 /** Variant of IEM_MC_SET_RIP_U16_AND_FINISH for pre-386 targets that checks and
     315/** Variant of IEM_MC_IND_JMP_U16_AND_FINISH for pre-386 targets that checks and
    316316 *  clears flags. */
    317 #define IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC16_WITH_FLAGS(a_u16NewIP) \
     317#define IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC16_WITH_FLAGS(a_u16NewIP) \
    318318    return iemRegRipJumpU16AndFinishClearingRF((pVCpu), (a_u16NewIP), 0 /* cbInstr - not used */)
    319319
    320 /** Variant of IEM_MC_SET_RIP_U16_AND_FINISH for 386+ targets that checks and
     320/** Variant of IEM_MC_IND_JMP_U16_AND_FINISH for 386+ targets that checks and
    321321 *  clears flags. */
    322 #define IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC32_WITH_FLAGS(a_u16NewIP) \
     322#define IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC32_WITH_FLAGS(a_u16NewIP) \
    323323    return iemRegRipJumpU16AndFinishClearingRF((pVCpu), (a_u16NewIP), 0 /* cbInstr - not used */)
    324324
    325 /** Variant of IEM_MC_SET_RIP_U16_AND_FINISH for use in 64-bit code that checks and
     325/** Variant of IEM_MC_IND_JMP_U16_AND_FINISH for use in 64-bit code that checks and
    326326 *  clears flags. */
    327 #define IEM_MC_SET_RIP_U16_AND_FINISH_THREADED_PC64_WITH_FLAGS(a_u16NewIP) \
     327#define IEM_MC_IND_JMP_U16_AND_FINISH_THREADED_PC64_WITH_FLAGS(a_u16NewIP) \
    328328    return iemRegRipJumpU16AndFinishClearingRF((pVCpu), (a_u16NewIP), 0 /* cbInstr - not used */)
    329329
    330 #undef IEM_MC_SET_RIP_U16_AND_FINISH
    331 
    332 
    333 /** Variant of IEM_MC_SET_RIP_U32_AND_FINISH for 386+ targets. */
    334 #define IEM_MC_SET_RIP_U32_AND_FINISH_THREADED_PC32(a_u32NewEIP) \
     330#undef IEM_MC_IND_JMP_U16_AND_FINISH
     331
     332
     333/** Variant of IEM_MC_IND_JMP_U32_AND_FINISH for 386+ targets. */
     334#define IEM_MC_IND_JMP_U32_AND_FINISH_THREADED_PC32(a_u32NewEIP) \
    335335    return iemRegRipJumpU32AndFinishNoFlags((pVCpu), (a_u32NewEIP))
    336336
    337 /** Variant of IEM_MC_SET_RIP_U32_AND_FINISH for use in 64-bit code. */
    338 #define IEM_MC_SET_RIP_U32_AND_FINISH_THREADED_PC64(a_u32NewEIP) \
     337/** Variant of IEM_MC_IND_JMP_U32_AND_FINISH for use in 64-bit code. */
     338#define IEM_MC_IND_JMP_U32_AND_FINISH_THREADED_PC64(a_u32NewEIP) \
    339339    return iemRegRipJumpU32AndFinishNoFlags((pVCpu), (a_u32NewEIP))
    340340
    341 /** Variant of IEM_MC_SET_RIP_U32_AND_FINISH for 386+ targets that checks and
     341/** Variant of IEM_MC_IND_JMP_U32_AND_FINISH for 386+ targets that checks and
    342342 *  clears flags. */
    343 #define IEM_MC_SET_RIP_U32_AND_FINISH_THREADED_PC32_WITH_FLAGS(a_u32NewEIP) \
     343#define IEM_MC_IND_JMP_U32_AND_FINISH_THREADED_PC32_WITH_FLAGS(a_u32NewEIP) \
    344344    return iemRegRipJumpU32AndFinishClearingRF((pVCpu), (a_u32NewEIP), 0 /* cbInstr - not used */)
    345345
    346 /** Variant of IEM_MC_SET_RIP_U32_AND_FINISH for use in 64-bit code that checks
     346/** Variant of IEM_MC_IND_JMP_U32_AND_FINISH for use in 64-bit code that checks
    347347 *  and clears flags. */
    348 #define IEM_MC_SET_RIP_U32_AND_FINISH_THREADED_PC64_WITH_FLAGS(a_u32NewEIP) \
     348#define IEM_MC_IND_JMP_U32_AND_FINISH_THREADED_PC64_WITH_FLAGS(a_u32NewEIP) \
    349349    return iemRegRipJumpU32AndFinishClearingRF((pVCpu), (a_u32NewEIP), 0 /* cbInstr - not used */)
    350350
    351 #undef IEM_MC_SET_RIP_U32_AND_FINISH
    352 
    353 
    354 /** Variant of IEM_MC_SET_RIP_U64_AND_FINISH for use in 64-bit code. */
    355 #define IEM_MC_SET_RIP_U64_AND_FINISH_THREADED_PC64(a_u32NewEIP) \
     351#undef IEM_MC_IND_JMP_U32_AND_FINISH
     352
     353
     354/** Variant of IEM_MC_IND_JMP_U64_AND_FINISH for use in 64-bit code. */
     355#define IEM_MC_IND_JMP_U64_AND_FINISH_THREADED_PC64(a_u32NewEIP) \
    356356    return iemRegRipJumpU64AndFinishNoFlags((pVCpu), (a_u32NewEIP))
    357357
    358 /** Variant of IEM_MC_SET_RIP_U64_AND_FINISH for use in 64-bit code that checks
     358/** Variant of IEM_MC_IND_JMP_U64_AND_FINISH for use in 64-bit code that checks
    359359 *  and clears flags. */
    360 #define IEM_MC_SET_RIP_U64_AND_FINISH_THREADED_PC64_WITH_FLAGS(a_u32NewEIP) \
     360#define IEM_MC_IND_JMP_U64_AND_FINISH_THREADED_PC64_WITH_FLAGS(a_u32NewEIP) \
    361361    return iemRegRipJumpU64AndFinishClearingRF((pVCpu), (a_u32NewEIP), 0 /* cbInstr - not used */)
    362362
    363 #undef IEM_MC_SET_RIP_U64_AND_FINISH
     363#undef IEM_MC_IND_JMP_U64_AND_FINISH
    364364
    365365
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette