Changeset 105718 in vbox for trunk/src/VBox
- Timestamp:
- Aug 19, 2024 2:20:25 AM (8 months ago)
- svn:sync-xref-src-repo-rev:
- 164421
- Location:
- trunk/src/VBox/VMM
- Files:
-
- 5 edited
-
VMMAll/IEMAllN8veRecompiler.cpp (modified) (6 diffs)
-
VMMAll/IEMAllThrdRecompiler.cpp (modified) (2 diffs)
-
VMMR3/IEMR3.cpp (modified) (13 diffs)
-
include/IEMInternal.h (modified) (2 diffs)
-
include/IEMN8veRecompiler.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/VMM/VMMAll/IEMAllN8veRecompiler.cpp
r105717 r105718 9105 9105 */ 9106 9106 pHlp->pfnPrintf(pHlp, 9107 "pTb=%p: GCPhysPc=%RGp cInstructions=%u LB %#x cRanges=%u\n"9107 "pTb=%p: GCPhysPc=%RGp (%%%RGv) cInstructions=%u LB %#x cRanges=%u\n" 9108 9108 "pTb=%p: cUsed=%u msLastUsed=%u fFlags=%#010x %s\n", 9109 pTb, pTb->GCPhysPc, pTb->cInstructions, pTb->cbOpcodes, pTb->cRanges, 9109 pTb, pTb->GCPhysPc, 9110 #ifdef IEMNATIVE_WITH_TB_DEBUG_INFO 9111 pTb->pDbgInfo ? pTb->pDbgInfo->FlatPc : RTGCPTR_MAX, 9112 #else 9113 pTb->FlatPc, 9114 #endif 9115 pTb->cInstructions, pTb->cbOpcodes, pTb->cRanges, 9110 9116 pTb, pTb->cUsed, pTb->msLastUsed, pTb->fFlags, iemTbFlagsToString(pTb->fFlags, szDisBuf, sizeof(szDisBuf))); 9111 9117 #ifdef IEMNATIVE_WITH_TB_DEBUG_INFO … … 9120 9126 */ 9121 9127 uint32_t idxThreadedCall = 0; 9128 uint32_t idxGuestInstr = 0; 9122 9129 uint32_t fExec = pTb->fFlags & UINT32_C(0x00ffffff); 9123 9130 uint8_t idxRange = UINT8_MAX; … … 9208 9215 memcpy(&szDisBuf[cch], s_szMarker, sizeof(s_szMarker)); 9209 9216 9210 pHlp->pfnPrintf(pHlp, " %%%%%RGp: %s\n", GCPhysPc, szDisBuf);9217 pHlp->pfnPrintf(pHlp, "\n %%%%%RGp: %s #%u\n", GCPhysPc, szDisBuf, idxGuestInstr); 9211 9218 } 9212 9219 else 9213 9220 { 9214 pHlp->pfnPrintf(pHlp, " %%%%%RGp: %.*Rhxs - guest disassembly failure %Rrc\n",9221 pHlp->pfnPrintf(pHlp, "\n %%%%%RGp: %.*Rhxs - guest disassembly failure %Rrc\n", 9215 9222 GCPhysPc, cbInstrMax, &pTb->pabOpcodes[offOpcodes], rc); 9216 9223 cbInstr = 1; 9217 9224 } 9225 idxGuestInstr++; 9218 9226 GCPhysPc += cbInstr; 9219 9227 offOpcodes += cbInstr; … … 9489 9497 | DIS_FMT_FLAGS_RELATIVE_BRANCH | DIS_FMT_FLAGS_C_HEX, 9490 9498 NULL /*pfnGetSymbol*/, NULL /*pvUser*/); 9491 pHlp->pfnPrintf(pHlp, " % RGp: %s\n", GCPhysPc, szDisBuf);9499 pHlp->pfnPrintf(pHlp, " %%%%%RGp: %s\n", GCPhysPc, szDisBuf); 9492 9500 GCPhysPc += cbInstr; 9493 9501 off += cbInstr; … … 9495 9503 else 9496 9504 { 9497 pHlp->pfnPrintf(pHlp, " % RGp: %.*Rhxs - disassembly failure %Rrc\n",9505 pHlp->pfnPrintf(pHlp, " %%%%%RGp: %.*Rhxs - disassembly failure %Rrc\n", 9498 9506 GCPhysPc, cbOpcodes - off, &pTb->pabOpcodes[off], rc); 9499 9507 break; … … 10337 10345 pTb->fFlags = (pTb->fFlags & ~IEMTB_F_TYPE_MASK) | IEMTB_F_TYPE_NATIVE; 10338 10346 #ifdef IEMNATIVE_WITH_TB_DEBUG_INFO 10347 pReNative->pDbgInfo->FlatPc = pTb->FlatPc; 10339 10348 pTb->pDbgInfo = (PIEMTBDBG)RTMemDup(pReNative->pDbgInfo, /* non-fatal, so not return check. */ 10340 10349 RT_UOFFSETOF_DYN(IEMTBDBG, aEntries[pReNative->pDbgInfo->cEntries])); -
trunk/src/VBox/VMM/VMMAll/IEMAllThrdRecompiler.cpp
r105712 r105718 1518 1518 */ 1519 1519 pHlp->pfnPrintf(pHlp, 1520 "pTb=%p: GCPhysPc=%RGp cInstructions=%u LB %#x cRanges=%u cTbLookupEntries=%u\n"1520 "pTb=%p: GCPhysPc=%RGp (%RGv) cInstructions=%u LB %#x cRanges=%u cTbLookupEntries=%u\n" 1521 1521 "pTb=%p: cUsed=%u msLastUsed=%u fFlags=%#010x %s\n", 1522 pTb, pTb->GCPhysPc, pTb-> cInstructions, pTb->cbOpcodes, pTb->cRanges, pTb->cTbLookupEntries,1522 pTb, pTb->GCPhysPc, pTb->FlatPc, pTb->cInstructions, pTb->cbOpcodes, pTb->cRanges, pTb->cTbLookupEntries, 1523 1523 pTb, pTb->cUsed, pTb->msLastUsed, pTb->fFlags, iemTbFlagsToString(pTb->fFlags, szDisBuf, sizeof(szDisBuf))); 1524 1524 … … 2780 2780 pVCpu->iem.s.pThrdCompileTbR3 = pTb; 2781 2781 } 2782 pTb->FlatPc = pVCpu->iem.s.uInstrBufPc | (GCPhysPc & GUEST_PAGE_OFFSET_MASK); 2782 2783 2783 2784 /* Set the current TB so iemThreadedCompileLongJumped and the CIMPL -
trunk/src/VBox/VMM/VMMR3/IEMR3.cpp
r105716 r105718 1778 1778 1779 1779 /** 1780 * Get get compile time flat PC for the TB. 1781 */ 1782 DECL_FORCE_INLINE(RTGCPTR) iemR3GetTbFlatPc(PCIEMTB pTb) 1783 { 1784 #ifdef IEMNATIVE_WITH_TB_DEBUG_INFO 1785 if (pTb->fFlags & IEMTB_F_TYPE_NATIVE) 1786 { 1787 PCIEMTBDBG const pDbgInfo = pTb->pDbgInfo; 1788 return pDbgInfo ? pDbgInfo->FlatPc : RTGCPTR_MAX; 1789 } 1790 #endif 1791 return pTb->FlatPc; 1792 } 1793 1794 1795 /** 1780 1796 * @callback_method_impl{FNDBGFINFOARGVINT, tb} 1781 1797 */ … … 1797 1813 { "--physical-address", 'p', RTGETOPT_REQ_UINT64 | RTGETOPT_FLAG_HEX }, 1798 1814 { "--flags", 'f', RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_HEX }, 1815 { "--tb", 't', RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_HEX }, 1816 { "--tb-id", 't', RTGETOPT_REQ_UINT32 }, 1799 1817 }; 1800 1818 … … 1808 1826 RTGCPHYS GCVirt = NIL_RTGCPTR; 1809 1827 uint32_t fFlags = UINT32_MAX; 1828 uint32_t idTb = UINT32_MAX; 1810 1829 1811 1830 RTGETOPTUNION ValueUnion; … … 1824 1843 GCVirt = ValueUnion.u64; 1825 1844 GCPhysPc = NIL_RTGCPHYS; 1845 idTb = UINT32_MAX; 1826 1846 break; 1827 1847 … … 1829 1849 GCVirt = NIL_RTGCPHYS; 1830 1850 GCPhysPc = ValueUnion.u64; 1851 idTb = UINT32_MAX; 1831 1852 break; 1832 1853 1833 1854 case 'f': 1834 fFlags = ValueUnion.u32; 1835 break; 1855 fFlags = ValueUnion.u32; 1856 break; 1857 1858 case 't': 1859 GCVirt = NIL_RTGCPHYS; 1860 GCPhysPc = NIL_RTGCPHYS; 1861 idTb = ValueUnion.u32; 1862 break; 1863 1864 case VINF_GETOPT_NOT_OPTION: 1865 { 1866 if ( (ValueUnion.psz[0] == 'T' || ValueUnion.psz[0] == 't') 1867 && (ValueUnion.psz[1] == 'B' || ValueUnion.psz[1] == 'b') 1868 && ValueUnion.psz[2] == '#') 1869 { 1870 rc = RTStrToUInt32Full(&ValueUnion.psz[3], 0, &idTb); 1871 if (RT_SUCCESS(rc)) 1872 { 1873 GCVirt = NIL_RTGCPHYS; 1874 GCPhysPc = NIL_RTGCPHYS; 1875 break; 1876 } 1877 pHlp->pfnPrintf(pHlp, "error: failed to convert '%s' to TD ID: %Rrc\n", ValueUnion.psz, rc); 1878 } 1879 else 1880 pHlp->pfnGetOptError(pHlp, rc, &ValueUnion, &State); 1881 return; 1882 } 1836 1883 1837 1884 case 'h': … … 1846 1893 " -p<phys>, --phys=<phys>, --phys-addr=<phys>\n" 1847 1894 " Shows the TB for the specified guest physical address.\n" 1895 " -t<id>, --tb=<id>, --tb-id=<id>, TD#<id>\n" 1896 " Show the TB specified by the identifier/number (from tbtop).\n" 1848 1897 " -f<flags>,--flags=<flags>\n" 1849 1898 " The TB flags value (hex) to use when looking up the TB.\n" … … 1869 1918 * Defaults. 1870 1919 */ 1871 if (GCPhysPc == NIL_RTGCPHYS )1920 if (GCPhysPc == NIL_RTGCPHYS && idTb == UINT32_MAX) 1872 1921 { 1873 1922 if (GCVirt == NIL_RTGCPTR) … … 1880 1929 } 1881 1930 } 1882 if (fFlags == UINT32_MAX )1931 if (fFlags == UINT32_MAX && idTb == UINT32_MAX) 1883 1932 { 1884 1933 /* Note! This is duplicating code in IEMAllThrdRecompiler. */ … … 1898 1947 } 1899 1948 1900 /* 1901 * Do the lookup... 1902 * 1903 * Note! This is also duplicating code in IEMAllThrdRecompiler. We don't 1904 * have much choice since we don't want to increase use counters and 1905 * trigger native recompilation. 1906 */ 1907 fFlags &= IEMTB_F_KEY_MASK; 1908 IEMTBCACHE const * const pTbCache = pVCpu->iem.s.pTbCacheR3; 1909 uint32_t const idxHash = IEMTBCACHE_HASH(pTbCache, fFlags, GCPhysPc); 1910 PCIEMTB pTb = IEMTBCACHE_PTR_GET_TB(pTbCache->apHash[idxHash]); 1911 while (pTb) 1912 { 1913 if (pTb->GCPhysPc == GCPhysPc) 1949 PCIEMTB pTb; 1950 if (idTb == UINT32_MAX) 1951 { 1952 /* 1953 * Do the lookup... 1954 * 1955 * Note! This is also duplicating code in IEMAllThrdRecompiler. We don't 1956 * have much choice since we don't want to increase use counters and 1957 * trigger native recompilation. 1958 */ 1959 fFlags &= IEMTB_F_KEY_MASK; 1960 IEMTBCACHE const * const pTbCache = pVCpu->iem.s.pTbCacheR3; 1961 uint32_t const idxHash = IEMTBCACHE_HASH(pTbCache, fFlags, GCPhysPc); 1962 pTb = IEMTBCACHE_PTR_GET_TB(pTbCache->apHash[idxHash]); 1963 while (pTb) 1914 1964 { 1915 if ( (pTb->fFlags & IEMTB_F_KEY_MASK) == fFlags)1965 if (pTb->GCPhysPc == GCPhysPc) 1916 1966 { 1917 /// @todo if (pTb->x86.fAttr == (uint16_t)pVCpu->cpum.GstCtx.cs.Attr.u) 1918 break; 1967 if ((pTb->fFlags & IEMTB_F_KEY_MASK) == fFlags) 1968 { 1969 /// @todo if (pTb->x86.fAttr == (uint16_t)pVCpu->cpum.GstCtx.cs.Attr.u) 1970 break; 1971 } 1919 1972 } 1973 pTb = pTb->pNext; 1920 1974 } 1921 pTb = pTb->pNext; 1975 if (!pTb) 1976 pHlp->pfnPrintf(pHlp, "PC=%RGp fFlags=%#x - no TB found on #%u\n", GCPhysPc, fFlags, pVCpu->idCpu); 1922 1977 } 1923 if (!pTb)1924 pHlp->pfnPrintf(pHlp, "PC=%RGp fFlags=%#x - no TB found on #%u\n", GCPhysPc, fFlags, pVCpu->idCpu);1925 1978 else 1979 { 1980 /* 1981 * Use the TB ID for indexing. 1982 */ 1983 pTb = NULL; 1984 PIEMTBALLOCATOR const pTbAllocator = pVCpu->iem.s.pTbAllocatorR3; 1985 if (pTbAllocator) 1986 { 1987 size_t const idxTbChunk = idTb / pTbAllocator->cTbsPerChunk; 1988 size_t const idxTbInChunk = idTb % pTbAllocator->cTbsPerChunk; 1989 if (idxTbChunk < pTbAllocator->cAllocatedChunks) 1990 pTb = &pTbAllocator->aChunks[idxTbChunk].paTbs[idxTbInChunk]; 1991 else 1992 pHlp->pfnPrintf(pHlp, "Invalid TB ID: %u (%#x)\n", idTb, idTb); 1993 } 1994 } 1995 1996 if (pTb) 1926 1997 { 1927 1998 /* 1928 1999 * Disassemble according to type. 1929 2000 */ 2001 size_t const idxTbChunk = pTb->idxAllocChunk; 2002 size_t const idxTbNo = (pTb - &pVCpu->iem.s.pTbAllocatorR3->aChunks[idxTbChunk].paTbs[0]) 2003 + idxTbChunk * pVCpu->iem.s.pTbAllocatorR3->cTbsPerChunk; 1930 2004 switch (pTb->fFlags & IEMTB_F_TYPE_MASK) 1931 2005 { 1932 2006 # ifdef VBOX_WITH_IEM_NATIVE_RECOMPILER 1933 2007 case IEMTB_F_TYPE_NATIVE: 1934 pHlp->pfnPrintf(pHlp, "PC=%RGp fFlags=%#x on #%u: %p - native\n", GCPhysPc, fFlags, pVCpu->idCpu, pTb); 2008 pHlp->pfnPrintf(pHlp, "PC=%RGp (%%%RGv) fFlags=%#x on #%u: TB#%#zx/%p - native\n", 2009 GCPhysPc, iemR3GetTbFlatPc(pTb), fFlags, pVCpu->idCpu, idxTbNo, pTb); 1935 2010 iemNativeDisassembleTb(pVCpu, pTb, pHlp); 1936 2011 break; … … 1938 2013 1939 2014 case IEMTB_F_TYPE_THREADED: 1940 pHlp->pfnPrintf(pHlp, "PC=%RGp fFlags=%#x on #%u: %p - threaded\n", GCPhysPc, fFlags, pVCpu->idCpu, pTb); 2015 pHlp->pfnPrintf(pHlp, "PC=%RGp (%%%RGv) fFlags=%#x on #%u: TB#%#zx/%p - threaded\n", 2016 GCPhysPc, pTb->FlatPc, fFlags, pVCpu->idCpu, idxTbNo, pTb); 1941 2017 iemThreadedDisassembleTb(pTb, pHlp); 1942 2018 break; 1943 2019 1944 2020 default: 1945 pHlp->pfnPrintf(pHlp, "PC=%RGp fFlags=%#x on #%u:%p - ??? %#x\n",1946 GCPhysPc, fFlags, pVCpu->idCpu, pTb, pTb->fFlags);2021 pHlp->pfnPrintf(pHlp, "PC=%RGp (%%%RGv) fFlags=%#x on #%u: TB#%#zx/%p - ??? %#x\n", 2022 GCPhysPc, pTb->FlatPc, fFlags, pVCpu->idCpu, idxTbNo, pTb, pTb->fFlags); 1947 2023 break; 1948 2024 } … … 2200 2276 pHlp->pfnPrintf(pHlp, "\n------------------------------- %u -------------------------------\n", idx); 2201 2277 2202 PCIEMTB pTb = aTop[idx].pTb; 2278 PCIEMTB const pTb = aTop[idx].pTb; 2279 size_t const idxTbChunk = pTb->idxAllocChunk; 2280 Assert(idxTbChunk < pTbAllocator->cAllocatedChunks); 2281 size_t const idxTbNo = (pTb - &pTbAllocator->aChunks[idxTbChunk].paTbs[0]) 2282 + idxTbChunk * pTbAllocator->cTbsPerChunk; 2203 2283 switch (pTb->fFlags & IEMTB_F_TYPE_MASK) 2204 2284 { 2205 2285 # ifdef VBOX_WITH_IEM_NATIVE_RECOMPILER 2206 2286 case IEMTB_F_TYPE_NATIVE: 2207 pHlp->pfnPrintf(pHlp, " PC=%RGpcUsed=%u msLastUsed=%u fFlags=%#010x - native\n",2208 pTb->GCPhysPc, pTb->cUsed, pTb->msLastUsed, pTb->fFlags);2287 pHlp->pfnPrintf(pHlp, "TB#%#zx: PC=%RGp (%%%RGv) cUsed=%u msLastUsed=%u fFlags=%#010x - native\n", 2288 idxTbNo, pTb->GCPhysPc, iemR3GetTbFlatPc(pTb), pTb->cUsed, pTb->msLastUsed, pTb->fFlags); 2209 2289 if (fDisassemble) 2210 2290 iemNativeDisassembleTb(pVCpu, pTb, pHlp); … … 2213 2293 2214 2294 case IEMTB_F_TYPE_THREADED: 2215 pHlp->pfnPrintf(pHlp, " PC=%RGpcUsed=%u msLastUsed=%u fFlags=%#010x - threaded\n",2216 pTb->GCPhysPc, pTb->cUsed, pTb->msLastUsed, pTb->fFlags);2295 pHlp->pfnPrintf(pHlp, "TB#%#zx: PC=%RGp (%%%RGv) cUsed=%u msLastUsed=%u fFlags=%#010x - threaded\n", 2296 idxTbNo, pTb->GCPhysPc, pTb->FlatPc, pTb->cUsed, pTb->msLastUsed, pTb->fFlags); 2217 2297 if (fDisassemble) 2218 2298 iemThreadedDisassembleTb(pTb, pHlp); … … 2220 2300 2221 2301 default: 2222 pHlp->pfnPrintf(pHlp, " PC=%RGpcUsed=%u msLastUsed=%u fFlags=%#010x - ???\n",2223 pTb->GCPhysPc, pTb->cUsed, pTb->msLastUsed, pTb->fFlags);2302 pHlp->pfnPrintf(pHlp, "TB#%#zx:%zu: PC=%RGp (%%%RGv) cUsed=%u msLastUsed=%u fFlags=%#010x - ???\n", 2303 idxTbNo, pTb->GCPhysPc, pTb->FlatPc, pTb->cUsed, pTb->msLastUsed, pTb->fFlags); 2224 2304 break; 2225 2305 } -
trunk/src/VBox/VMM/include/IEMInternal.h
r105702 r105718 1488 1488 typedef struct IEMTBDBG 1489 1489 { 1490 /** This is the flat PC corresponding to IEMTB::GCPhysPc. */ 1491 RTGCPTR FlatPc; 1490 1492 /** Number of entries in aEntries. */ 1491 1493 uint32_t cEntries; … … 1581 1583 uint8_t *pabOpcodes; 1582 1584 1583 /** Debug info if enabled. 1584 * This is only generated by the native recompiler. */ 1585 PIEMTBDBG pDbgInfo; 1585 union 1586 { 1587 /** Native recompilation debug info if enabled. 1588 * This is only generated by the native recompiler. */ 1589 PIEMTBDBG pDbgInfo; 1590 /** For threaded TBs and natives when debug info is disabled, this is the flat 1591 * PC corresponding to GCPhysPc. */ 1592 RTGCPTR FlatPc; 1593 }; 1586 1594 1587 1595 /* --- 64 byte cache line end --- */ -
trunk/src/VBox/VMM/include/IEMN8veRecompiler.h
r105673 r105718 42 42 /** @def IEMNATIVE_WITH_TB_DEBUG_INFO 43 43 * Enables generating internal debug info for better TB disassembly dumping. */ 44 #if defined(DEBUG) || defined(DOXYGEN_RUNNING) 44 #if defined(DEBUG) || defined(DOXYGEN_RUNNING) || 0 45 45 # define IEMNATIVE_WITH_TB_DEBUG_INFO 46 46 #endif
Note:
See TracChangeset
for help on using the changeset viewer.
