summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorVincentius Robby <acolyte@umich.edu>2007-08-08 14:54:02 -0400
committerVincentius Robby <acolyte@umich.edu>2007-08-08 14:54:02 -0400
commit3d40cba8d456b7057d84332799f129dadaff9cd3 (patch)
tree7a91b85374eca6c76f88ba8c5dadbe41c08ebb65 /src/cpu
parent13d10e844c7465b4f7375da6e196cd36ffd0e37d (diff)
downloadgem5-3d40cba8d456b7057d84332799f129dadaff9cd3.tar.xz
Port, StaticInst: Revert unnecessary changes.
--HG-- extra : convert_revision : e6ef262bbbc5ad53498e55caac1897e6cc2a61e6
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/static_inst.hh27
1 files changed, 14 insertions, 13 deletions
diff --git a/src/cpu/static_inst.hh b/src/cpu/static_inst.hh
index c4a29da59..2e1ebd766 100644
--- a/src/cpu/static_inst.hh
+++ b/src/cpu/static_inst.hh
@@ -597,19 +597,20 @@ StaticInst::decode(StaticInst::ExtMachInst mach_inst, Addr addr)
Addr page_addr = addr & ~(TheISA::PageBytes - 1);
// checks recently decoded addresses
- if (recentDecodes[0].decodePage) {
- if (page_addr == recentDecodes[0].page_addr) {
- if (recentDecodes[0].decodePage->decoded(mach_inst, addr))
- return recentDecodes[0].decodePage->getInst(addr);
-
- 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[0].decodePage &&
+ page_addr == recentDecodes[0].page_addr) {
+ if (recentDecodes[0].decodePage->decoded(mach_inst, addr))
+ return recentDecodes[0].decodePage->getInst(addr);
+
+ return searchCache(mach_inst, addr, recentDecodes[0].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