diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-07-23 13:41:53 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-07-23 13:41:53 -0400 |
| commit | 6e969c31c7c0671ce201f40dd67afad2e9fee832 (patch) | |
| tree | 1a7a5bc1e52dd54ff3319837fa87c018d8dd08b0 /src/arch/mips/isa/formats/branch.isa | |
| parent | f9729e999f71895f6b53f8189bdff535e7c7b70e (diff) | |
| parent | 19ca97af79f3a40111991b4f8375592c7ede65fa (diff) | |
| download | gem5-6e969c31c7c0671ce201f40dd67afad2e9fee832.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-o3
--HG--
extra : convert_revision : be1e5dcb1c5025db8526e628c2060b1790d38227
Diffstat (limited to 'src/arch/mips/isa/formats/branch.isa')
| -rw-r--r-- | src/arch/mips/isa/formats/branch.isa | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/arch/mips/isa/formats/branch.isa b/src/arch/mips/isa/formats/branch.isa index 5230ce9cc..9db3108b4 100644 --- a/src/arch/mips/isa/formats/branch.isa +++ b/src/arch/mips/isa/formats/branch.isa @@ -235,10 +235,11 @@ def format Branch(code,*opt_flags) {{ else: inst_flags += (x, ) + #Take into account uncond. branch instruction if 'cond == 1' in code: - inst_flags += ('IsCondControl', ) + inst_flags += ('IsUnCondControl', ) else: - inst_flags += ('IsUncondControl', ) + inst_flags += ('IsCondControl', ) #Condition code code = 'bool cond;\n' + code |