From: Korey Sewell <ksewell@umich.edu>
Date: Sat, 11 Jun 2011 02:15:32 +0000 (-0400)
Subject: sparc: don't use directcntrl branch flag
X-Git-Tag: stable_2012_02_02~280
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4229bce89d6683679fae3ebbeda3ef675f73069f;p=gem5.git

sparc: don't use directcntrl branch flag
this flag is only used for early branch resolution in the O3 model (of pc-relative branches)
but this isnt cleanly working even when the branch target code is added for sparc. For now,
we'll ignore this optimization and add a todo in the SPARC ISA for future developers
---

diff --git a/src/arch/sparc/isa/formats/branch.isa b/src/arch/sparc/isa/formats/branch.isa
index 014c0d486..b34704f06 100644
--- a/src/arch/sparc/isa/formats/branch.isa
+++ b/src/arch/sparc/isa/formats/branch.isa
@@ -262,8 +262,9 @@ def format Branch(code, *opt_flags) {{
 let {{
     def doBranch(name, Name, base, cond,
             code, annul_code, fail, annul_fail, opt_flags):
-        if "IsIndirectControl" not in opt_flags:
-           opt_flags += ('IsDirectControl', )
+        #@todo: add flags and branchTarget() for DirectCntrl branches
+        #       the o3 model can take advantage of this annotation if
+        #       done correctly
 
         iop = InstObjParams(name, Name, base,
                 {"code": code,