mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove the victim cache code to resolve assert in proc_ctrl.cc

Browse Source
This commit is contained in:
Stanislav Shwartsman 2015-05-04 19:47:52 +00:00
parent 4c34b97db1
commit 28fc5083af
2 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bochs/cpu/icache.cc
View File

@ -71,8 +71,6 @@ bxICacheEntry_c* BX_CPU_C::serveICacheMiss(bxICacheEntry_c *entry, Bit32u eipBia
{ {
entry = BX_CPU_THIS_PTR iCache.get_entry(pAddr, BX_CPU_THIS_PTR fetchModeMask); entry = BX_CPU_THIS_PTR iCache.get_entry(pAddr, BX_CPU_THIS_PTR fetchModeMask);
BX_CPU_THIS_PTR iCache.victim_entry(entry, BX_CPU_THIS_PTR fetchModeMask);
BX_CPU_THIS_PTR iCache.alloc_trace(entry); BX_CPU_THIS_PTR iCache.alloc_trace(entry);
// Cache miss. We weren't so lucky, but let's be optimistic - try to build // Cache miss. We weren't so lucky, but let's be optimistic - try to build

43
bochs/cpu/icache.h
View File

@ -145,13 +145,6 @@ public:
} pageSplitIndex[BX_ICACHE_PAGE_SPLIT_ENTRIES]; } pageSplitIndex[BX_ICACHE_PAGE_SPLIT_ENTRIES];
int nextPageSplitIndex; int nextPageSplitIndex;
#define BX_ICACHE_VICTIM_ENTRIES 8 /* must be power of two */
struct bxVictimCacheEntry {
Bit32u fetchModeMask;
bxICacheEntry_c vc_entry;
} victimCache[BX_ICACHE_VICTIM_ENTRIES];
int nextVictimCacheIndex;
public: public:
bxICache_c() { flushICacheEntries(); } bxICache_c() { flushICacheEntries(); }
@ -187,27 +180,6 @@ public:
nextPageSplitIndex = (nextPageSplitIndex+1) & (BX_ICACHE_PAGE_SPLIT_ENTRIES-1); nextPageSplitIndex = (nextPageSplitIndex+1) & (BX_ICACHE_PAGE_SPLIT_ENTRIES-1);
} }
BX_CPP_INLINE bxICacheEntry_c *lookup_victim_cache(bx_phy_address pAddr, Bit32u fetchModeMask)
{
for (int i=0; i < BX_ICACHE_VICTIM_ENTRIES;i++) {
bxVictimCacheEntry *e = &victimCache[i];
if (e->vc_entry.pAddr == pAddr && e->fetchModeMask == fetchModeMask) {
return &e->vc_entry;
}
}
return NULL;
}
BX_CPP_INLINE void victim_entry(bxICacheEntry_c *e, Bit32u fetchModeMask)
{
if (e->pAddr != BX_ICACHE_INVALID_PHY_ADDRESS) {
victimCache[nextVictimCacheIndex].fetchModeMask = fetchModeMask;
victimCache[nextVictimCacheIndex].vc_entry = *e;
nextVictimCacheIndex = (nextVictimCacheIndex+1) & (BX_ICACHE_VICTIM_ENTRIES-1);
}
}
BX_CPP_INLINE void handleSMC(bx_phy_address pAddr, Bit32u mask); BX_CPP_INLINE void handleSMC(bx_phy_address pAddr, Bit32u mask);
BX_CPP_INLINE void flushICacheEntries(void); BX_CPP_INLINE void flushICacheEntries(void);
@ -219,9 +191,9 @@ public:
BX_CPP_INLINE bxICacheEntry_c* find_entry(bx_phy_address pAddr, unsigned fetchModeMask) BX_CPP_INLINE bxICacheEntry_c* find_entry(bx_phy_address pAddr, unsigned fetchModeMask)
{ {
bxICacheEntry_c* e = &entry[hash(pAddr, fetchModeMask)]; bxICacheEntry_c* e = get_entry(pAddr, fetchModeMask);
if (e->pAddr != pAddr) if (e->pAddr != pAddr)
e = lookup_victim_cache(pAddr, fetchModeMask); return NULL;
return e; return e;
} }
@ -241,10 +213,6 @@ BX_CPP_INLINE void bxICache_c::flushICacheEntries(void)
for (i=0;i<BX_ICACHE_PAGE_SPLIT_ENTRIES;i++) for (i=0;i<BX_ICACHE_PAGE_SPLIT_ENTRIES;i++)
pageSplitIndex[i].ppf = BX_ICACHE_INVALID_PHY_ADDRESS; pageSplitIndex[i].ppf = BX_ICACHE_INVALID_PHY_ADDRESS;
nextVictimCacheIndex = 0;
for (i=0;i<BX_ICACHE_VICTIM_ENTRIES;i++)
victimCache[i].vc_entry.pAddr = BX_ICACHE_INVALID_PHY_ADDRESS;
mpindex = 0; mpindex = 0;
traceLinkTimeStamp = 0; traceLinkTimeStamp = 0;
@ -283,13 +251,6 @@ BX_CPP_INLINE void bxICache_c::handleSMC(bx_phy_address pAddr, Bit32u mask)
} }
} }
for (unsigned i=0;i < BX_ICACHE_VICTIM_ENTRIES; i++) {
bxICacheEntry_c *e = &victimCache[i].vc_entry;
if (pAddrIndex == bxPageWriteStampTable::hash(e->pAddr) && (e->traceMask & mask) != 0) {
flushSMC(e);
}
}
bxICacheEntry_c *e = get_entry(LPFOf(pAddr), 0); bxICacheEntry_c *e = get_entry(LPFOf(pAddr), 0);
// go over 32 "cache lines" of 128 byte each // go over 32 "cache lines" of 128 byte each