Changeset 58106 in vbox for trunk/src/recompiler/VBoxRecompiler.c
- Timestamp:
- Oct 7, 2015 5:07:25 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/recompiler/VBoxRecompiler.c
r57358 r58106 3525 3525 * @param addr The virtual address. 3526 3526 * @param pTLBEntry The TLB entry. 3527 * @param IoTlbEntry The I/O TLB entry address. 3527 3528 */ 3528 3529 target_ulong remR3PhysGetPhysicalAddressCode(CPUX86State *env, 3529 3530 target_ulong addr, 3530 3531 CPUTLBEntry *pTLBEntry, 3531 target_phys_addr_t ioTLBEntry)3532 target_phys_addr_t IoTlbEntry) 3532 3533 { 3533 3534 PVM pVM = env->pVM; 3534 3535 3535 if (( ioTLBEntry & ~TARGET_PAGE_MASK) == pVM->rem.s.iHandlerMemType)3536 if ((IoTlbEntry & ~TARGET_PAGE_MASK) == pVM->rem.s.iHandlerMemType) 3536 3537 { 3537 3538 /* If code memory is being monitored, appropriate IOTLB entry will have 3538 3539 handler IO type, and addend will provide real physical address, no 3539 3540 matter if we store VA in TLB or not, as handlers are always passed PA */ 3540 target_ulong ret = ( ioTLBEntry & TARGET_PAGE_MASK) + addr;3541 target_ulong ret = (IoTlbEntry & TARGET_PAGE_MASK) + addr; 3541 3542 return ret; 3542 3543 } 3543 3544 LogRel(("\nTrying to execute code with memory type addr_code=%RGv addend=%RGp at %RGv! (iHandlerMemType=%#x iMMIOMemType=%#x IOTLB=%RGp)\n" 3544 3545 "*** handlers\n", 3545 (RTGCPTR)pTLBEntry->addr_code, (RTGCPHYS)pTLBEntry->addend, (RTGCPTR)addr, pVM->rem.s.iHandlerMemType, pVM->rem.s.iMMIOMemType, (RTGCPHYS) ioTLBEntry));3546 (RTGCPTR)pTLBEntry->addr_code, (RTGCPHYS)pTLBEntry->addend, (RTGCPTR)addr, pVM->rem.s.iHandlerMemType, pVM->rem.s.iMMIOMemType, (RTGCPHYS)IoTlbEntry)); 3546 3547 DBGFR3Info(pVM->pUVM, "handlers", NULL, DBGFR3InfoLogRelHlp()); 3547 3548 LogRel(("*** mmio\n")); … … 4094 4095 * @param cb Size of the code block. 4095 4096 */ 4096 void disas(FILE *phFile , void *pvCode, unsigned long cb)4097 void disas(FILE *phFileIgnored, void *pvCode, unsigned long cb) 4097 4098 { 4098 4099 if (LogIs2Enabled()) … … 4134 4135 * @param fFlags Flags, probably something which tells if this is 16, 32 or 64 bit code. 4135 4136 */ 4136 void target_disas(FILE *phFile , target_ulong uCode, target_ulong cb, int fFlags)4137 void target_disas(FILE *phFileIgnored, target_ulong uCode, target_ulong cb, int fFlags) 4137 4138 { 4138 4139 if (LogIs2Enabled()) … … 4583 4584 * @retval -1 failure, raise \#GP(0). 4584 4585 * @param env The cpu state. 4585 * @param idMsr The MSR to read.4586 * @param puValue Where to return the value.4586 * @param idMsr The MSR to write to. 4587 * @param uValue The value to write. 4587 4588 */ 4588 4589 int cpu_wrmsr(CPUX86State *env, uint32_t idMsr, uint64_t uValue) … … 4717 4718 * @param idx The CPUID leaf (eax). 4718 4719 * @param idxSub The CPUID sub-leaf (ecx) where applicable. 4719 * @param p vEAXWhere to store eax.4720 * @param p vEBXWhere to store ebx.4721 * @param p vECXWhere to store ecx.4722 * @param p vEDXWhere to store edx.4720 * @param pEAX Where to store eax. 4721 * @param pEBX Where to store ebx. 4722 * @param pECX Where to store ecx. 4723 * @param pEDX Where to store edx. 4723 4724 */ 4724 4725 void cpu_x86_cpuid(CPUX86State *env, uint32_t idx, uint32_t idxSub,
Note:
See TracChangeset
for help on using the changeset viewer.