sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Port, StaticInst: Revert unnecessary changes.

Browse source 
--HG--
extra : convert_revision : e6ef262bbbc5ad53498e55caac1897e6cc2a61e6
This commit is contained in:
Vincentius Robby 2007-08-08 14:54:02 -04:00
parent 13d10e844c
commit 3d40cba8d4
2 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/cpu/static_inst.hh
View file

@ -597,19 +597,20 @@ StaticInst::decode(StaticInst::ExtMachInst mach_inst, Addr addr)
Addr page_addr = addr & ~(TheISA::PageBytes - 1); Addr page_addr = addr & ~(TheISA::PageBytes - 1);
// checks recently decoded addresses // checks recently decoded addresses
if (recentDecodes[0].decodePage) { if (recentDecodes[0].decodePage &&
if (page_addr == recentDecodes[0].page_addr) { page_addr == recentDecodes[0].page_addr) {
if (recentDecodes[0].decodePage->decoded(mach_inst, addr)) if (recentDecodes[0].decodePage->decoded(mach_inst, addr))
return recentDecodes[0].decodePage->getInst(addr); return recentDecodes[0].decodePage->getInst(addr);
return searchCache(mach_inst, addr, recentDecodes[0].decodePage); return searchCache(mach_inst, addr, recentDecodes[0].decodePage);
} else if (recentDecodes[1].decodePage && }
page_addr == recentDecodes[1].page_addr) {
if (recentDecodes[1].decodePage->decoded(mach_inst, addr))
return recentDecodes[1].decodePage->getInst(addr);
return searchCache(mach_inst, addr, recentDecodes[1].decodePage); if (recentDecodes[1].decodePage &&
} page_addr == recentDecodes[1].page_addr) {
if (recentDecodes[1].decodePage->decoded(mach_inst, addr))
return recentDecodes[1].decodePage->getInst(addr);
return searchCache(mach_inst, addr, recentDecodes[1].decodePage);
} }
// searches the page containing the address to decode // searches the page containing the address to decode

42
src/mem/bus.hh
View file

@ -193,17 +193,17 @@ class Bus : public MemObject
// Checks the cache and returns the id of the port that has the requested // Checks the cache and returns the id of the port that has the requested
// address within its range // address within its range
inline int checkPortCache(Addr addr) { inline int checkPortCache(Addr addr) {
if (portCache[0].valid) { if (portCache[0].valid && addr >= portCache[0].start &&
if (addr >= portCache[0].start && addr < portCache[0].end) { addr < portCache[0].end) {
return portCache[0].id; return portCache[0].id;
} else if (portCache[1].valid) { }
if (addr >= portCache[1].start && addr < portCache[1].end) { if (portCache[1].valid && addr >= portCache[1].start &&
return portCache[1].id; addr < portCache[1].end) {
} else if (portCache[2].valid && addr >= portCache[2].start && return portCache[1].id;
addr < portCache[2].end) { }
return portCache[2].id; if (portCache[2].valid && addr >= portCache[2].start &&
} addr < portCache[2].end) {
} return portCache[2].id;
} }
return -1; return -1;
@ -312,17 +312,14 @@ class Bus : public MemObject
// Checks the peer port interfaces cache for the port id and returns // Checks the peer port interfaces cache for the port id and returns
// a pointer to the matching port // a pointer to the matching port
inline BusPort* checkBusCache(short id) { inline BusPort* checkBusCache(short id) {
if (busCache[0].valid) { if (busCache[0].valid && id == busCache[0].id) {
if (id == busCache[0].id) { return busCache[0].port;
return busCache[0].port; }
if (busCache[1].valid) { if (busCache[1].valid && id == busCache[1].id) {
if (id == busCache[1].id) { return busCache[1].port;
return busCache[1].port; }
if (busCache[2].valid && id == busCache[2].id) if (busCache[2].valid && id == busCache[2].id) {
return busCache[2].port; return busCache[2].port;
}
}
}
} }
return NULL; return NULL;
@ -345,7 +342,6 @@ class Bus : public MemObject
// Invalidates the cache. Needs to be called in constructor. // Invalidates the cache. Needs to be called in constructor.
inline void clearBusCache() { inline void clearBusCache() {
// memset(busCache, 0, 3 * sizeof(BusCache));
busCache[2].valid = false; busCache[2].valid = false;
busCache[1].valid = false; busCache[1].valid = false;
busCache[0].valid = false; busCache[0].valid = false;