From 10b4b364d9d42bcefda7ff18e1de9152dc6456d1 Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Mon, 7 Feb 2011 12:42:23 -0600
Subject: [PATCH] Orion: Replace printf() with fatal() The code for Orion 2.0
 makes use of printf() at several places where there as an error in
 configuration of the model. These have been replaced with fatal().

---
 src/mem/ruby/network/orion/Buffer/BitlineUnit.cc   | 3 ++-
 src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc    | 3 ++-
 src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc | 5 +++--
 src/mem/ruby/network/orion/Buffer/SRAM.hh          | 1 -
 src/mem/ruby/network/orion/Buffer/WordlineUnit.cc  | 3 ++-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/mem/ruby/network/orion/Buffer/BitlineUnit.cc b/src/mem/ruby/network/orion/Buffer/BitlineUnit.cc
index 05d0ae3821..276e481c9f 100644
--- a/src/mem/ruby/network/orion/Buffer/BitlineUnit.cc
+++ b/src/mem/ruby/network/orion/Buffer/BitlineUnit.cc
@@ -33,6 +33,7 @@
  *           Kambiz Samadi (Orion 2.0, UC San Diego)
  */
 
+#include "base/misc.hh"
 #include "mem/ruby/network/orion/Buffer/BitlineUnit.hh"
 #include "mem/ruby/network/orion/Buffer/SRAM.hh"
 #include "mem/ruby/network/orion/TechParameter.hh"
@@ -112,7 +113,7 @@ void BitlineUnit::init()
             //FIXME - no static power?
             break;
         default:
-            printf("error\n");
+            fatal("Error in BITLINE model.\n");
     }
     return;
 }
diff --git a/src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc b/src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc
index 716fc18ee0..ce17074912 100644
--- a/src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc
+++ b/src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc
@@ -33,6 +33,7 @@
  *           Kambiz Samadi (Orion 2.0, UC San Diego)
  */
 
+#include "base/misc.hh"
 #include "mem/ruby/network/orion/Buffer/OutdrvUnit.hh"
 #include "mem/ruby/network/orion/TechParameter.hh"
 #include "mem/ruby/network/orion/Buffer/SRAM.hh"
@@ -91,7 +92,7 @@ void OutdrvUnit::init()
             m_e_chg_data = 0;
             break;
         default:
-            printf("error\n");
+            fatal("Incorrect OUTDRIVE model.\n");
     }
 
     m_i_static = calc_i_static();
diff --git a/src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc b/src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc
index ac91edb437..480ebe82ca 100644
--- a/src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc
+++ b/src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc
@@ -33,6 +33,7 @@
  *           Kambiz Samadi (Orion 2.0, UC San Diego)
  */
 
+#include "base/misc.hh"
 #include "mem/ruby/network/orion/Buffer/PrechargeUnit.hh"
 #include "mem/ruby/network/orion/TechParameter.hh"
 #include "mem/ruby/network/orion/Buffer/SRAM.hh"
@@ -114,7 +115,7 @@ uint32_t PrechargeUnit::calc_num_pre_gate()
         case SINGLE_BITLINE: return 2;
         case EQU_BITLINE:    return 3;
         case SINGLE_OTHER:   return 1;
-        default: printf("error\n"); return 0;
+        default: fatal("Incorrect Precharge Unit model.\n");
     }
 }
 
@@ -125,7 +126,7 @@ uint32_t PrechargeUnit::calc_num_pre_drain()
         case SINGLE_BITLINE: return 1;
         case EQU_BITLINE:    return 2;
         case SINGLE_OTHER:   return 1;
-        default: printf("error\n"); return 0;
+        default: fatal("Incorrect Precharge Unit model.\n");
     }
 }
 
diff --git a/src/mem/ruby/network/orion/Buffer/SRAM.hh b/src/mem/ruby/network/orion/Buffer/SRAM.hh
index f0b937963b..7b3f466983 100644
--- a/src/mem/ruby/network/orion/Buffer/SRAM.hh
+++ b/src/mem/ruby/network/orion/Buffer/SRAM.hh
@@ -39,7 +39,6 @@
 #include "mem/ruby/network/orion/Type.hh"
 #include "mem/ruby/network/orion/OrionConfig.hh"
 #include "mem/ruby/network/orion/TechParameter.hh"
-#include <stdio.h>
 
 class OutdrvUnit;
 class AmpUnit;
diff --git a/src/mem/ruby/network/orion/Buffer/WordlineUnit.cc b/src/mem/ruby/network/orion/Buffer/WordlineUnit.cc
index bc28444e2c..3f2cdc34bc 100644
--- a/src/mem/ruby/network/orion/Buffer/WordlineUnit.cc
+++ b/src/mem/ruby/network/orion/Buffer/WordlineUnit.cc
@@ -33,6 +33,7 @@
  *           Kambiz Samadi (Orion 2.0, UC San Diego)
  */
 
+#include "base/misc.hh"
 #include "mem/ruby/network/orion/Buffer/WordlineUnit.hh"
 #include "mem/ruby/network/orion/Buffer/SRAM.hh"
 #include "mem/ruby/network/orion/TechParameter.hh"
@@ -118,7 +119,7 @@ void WordlineUnit::init()
             m_i_static = 0;
             break;
         default:
-            printf("error\n");
+            fatal("Incorrect Wordline model.\n");
     }
     return;
 }