summaryrefslogtreecommitdiff
path: root/arch/mips/isa/formats/branch.isa
diff options
context:
space:
mode:
authorKorey Sewell <ksewell@umich.edu>2006-04-10 12:37:15 -0400
committerKorey Sewell <ksewell@umich.edu>2006-04-10 12:37:15 -0400
commitf51656498ea4c3418499f25e5a7a24b4c71be122 (patch)
treef54ef3c2ec601519e0cc98f007705e56a4b20dc0 /arch/mips/isa/formats/branch.isa
parentae1a95ed9c9aa2b3c97272570575345dc3c37799 (diff)
parent4f430e9ab56443e822171b7881f4d50475dbaf25 (diff)
downloadgem5-f51656498ea4c3418499f25e5a7a24b4c71be122.tar.xz
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-mips arch/mips/isa/formats/mem.isa: Filled in Split-Memory Access Code arch/mips/isa_traits.hh: Leave IntRegFile as an array instead of class with member functions mem/page_table.cc: take out NO ALIGN FAULT page table access code for now... No need to messs up what works --HG-- extra : convert_revision : cbf1cce9145daf9ee9ceabc9080271ddb0561489
Diffstat (limited to 'arch/mips/isa/formats/branch.isa')
-rw-r--r--arch/mips/isa/formats/branch.isa2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/isa/formats/branch.isa b/arch/mips/isa/formats/branch.isa
index cb0f4ac9c..39db88c23 100644
--- a/arch/mips/isa/formats/branch.isa
+++ b/arch/mips/isa/formats/branch.isa
@@ -179,7 +179,7 @@ output decoder {{
ss << ",";
}
- Addr target = pc + 8 + disp;
+ Addr target = pc + 4 + disp;
std::string str;
if (symtab && symtab->findSymbol(target, str))