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 05d0ae382..276e481c9 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 716fc18ee..ce1707491 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 ac91edb43..480ebe82c 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 f0b937963..7b3f46698 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 bc28444e2..3f2cdc34b 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;
 }