changeset 68f37178b408 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=68f37178b408
description:
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().
diffstat:
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(-)
diffs (100 lines):
diff -r 5f2a2deb377d -r 68f37178b408
src/mem/ruby/network/orion/Buffer/BitlineUnit.cc
--- a/src/mem/ruby/network/orion/Buffer/BitlineUnit.cc Mon Feb 07 12:19:46
2011 -0500
+++ b/src/mem/ruby/network/orion/Buffer/BitlineUnit.cc Mon Feb 07 12:42:23
2011 -0600
@@ -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 @@
//FIXME - no static power?
break;
default:
- printf("error\n");
+ fatal("Error in BITLINE model.\n");
}
return;
}
diff -r 5f2a2deb377d -r 68f37178b408
src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc
--- a/src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc Mon Feb 07 12:19:46
2011 -0500
+++ b/src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc Mon Feb 07 12:42:23
2011 -0600
@@ -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 @@
m_e_chg_data = 0;
break;
default:
- printf("error\n");
+ fatal("Incorrect OUTDRIVE model.\n");
}
m_i_static = calc_i_static();
diff -r 5f2a2deb377d -r 68f37178b408
src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc
--- a/src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc Mon Feb 07
12:19:46 2011 -0500
+++ b/src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc Mon Feb 07
12:42:23 2011 -0600
@@ -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 @@
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 @@
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 -r 5f2a2deb377d -r 68f37178b408 src/mem/ruby/network/orion/Buffer/SRAM.hh
--- a/src/mem/ruby/network/orion/Buffer/SRAM.hh Mon Feb 07 12:19:46 2011 -0500
+++ b/src/mem/ruby/network/orion/Buffer/SRAM.hh Mon Feb 07 12:42:23 2011 -0600
@@ -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 -r 5f2a2deb377d -r 68f37178b408
src/mem/ruby/network/orion/Buffer/WordlineUnit.cc
--- a/src/mem/ruby/network/orion/Buffer/WordlineUnit.cc Mon Feb 07 12:19:46
2011 -0500
+++ b/src/mem/ruby/network/orion/Buffer/WordlineUnit.cc Mon Feb 07 12:42:23
2011 -0600
@@ -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 @@
m_i_static = 0;
break;
default:
- printf("error\n");
+ fatal("Incorrect Wordline model.\n");
}
return;
}
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
