Hand-merge static_inst.hh. These execute functions are within an external file in the new CPU case.

cpu/static_inst.hh: Hand-merge. These execute functions are within an external file in the new CPU case. --HG-- extra : convert_revision : a34112f471fa31bdd5bb53552ddd704b9571c110
2005-03-08 21:03:20 -05:00
parent bb41c21d6a 550e6a5010
commit 2162b433ad
17 changed files with 392 additions and 306 deletions
--- a/base/statistics.hh
+++ b/base/statistics.hh
@@ -2872,12 +2872,6 @@ operator/(Temp l, Temp r)
    return NodePtr(new BinaryNode<std::divides<Result> >(l, r));
 }

-inline Temp
-operator%(Temp l, Temp r)
-{
-    return NodePtr(new BinaryNode<std::modulus<Result> >(l, r));
-}
-
 inline Temp
 operator-(Temp l)
 {