Fix init warnings, remove echo from makefile

dramninjasUMD · May 15, 2012 · bbc1ca6 · bbc1ca6
1 parent d387773
commit bbc1ca6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/Bank.cpp b/Bank.cpp
@@ -40,8 +40,8 @@ using namespace std;
 using namespace DRAMSim;
 
 Bank::Bank(ostream &dramsim_log_):
-		rowEntries(NUM_COLS),
 		currentState(dramsim_log_), 
+		rowEntries(NUM_COLS),
 		dramsim_log(dramsim_log_)
 {}
 

diff --git a/Makefile b/Makefile
@@ -45,7 +45,7 @@ $(LIB_NAME_MACOS): $(POBJ)
 	@$(CXX) -M $(CXXFLAGS) $< > $@
 
 %.deppo : %.cpp
-	$(CXX) -M $(CXXFLAGS) -MT"$*.po" $< > $@
+	@$(CXX) -M $(CXXFLAGS) -MT"$*.po" $< > $@
 
 # build all .cpp files to .o files
 %.o : %.cpp

diff --git a/Rank.cpp b/Rank.cpp
@@ -38,14 +38,14 @@ using namespace std;
 using namespace DRAMSim;
 
 Rank::Rank(ostream &dramsim_log_) :
+	id(-1),
 	dramsim_log(dramsim_log_),
+	isPowerDown(false),
+	refreshWaiting(false),
+	readReturnCountdown(0),
 	banks(NUM_BANKS, Bank(dramsim_log_)),
-	bankStates(NUM_BANKS, BankState(dramsim_log_)),
-		// store the rank #, mostly for convenience and printing
-		id(-1),
-		isPowerDown(false),
-		refreshWaiting(false),
-		readReturnCountdown(0)
+	bankStates(NUM_BANKS, BankState(dramsim_log_))
+
 {
 
 	memoryController = NULL;

diff --git a/Rank.h b/Rank.h
@@ -49,8 +49,8 @@ class MemoryController; //forward declaration
 class Rank : public SimulatorObject
 {
 private:
-	ostream &dramsim_log; 
 	int id;
+	ostream &dramsim_log; 
 	unsigned incomingWriteBank;
 	unsigned incomingWriteRow;
 	unsigned incomingWriteColumn;
@@ -68,7 +68,6 @@ class Rank : public SimulatorObject
 	void powerDown();
 
 	//fields
-	vector<Bank> banks;
 	MemoryController *memoryController;
 	BusPacket *outgoingDataPacket;
 	unsigned dataCyclesLeft;
@@ -77,7 +76,9 @@ class Rank : public SimulatorObject
 	//these are vectors so that each element is per-bank
 	vector<BusPacket *> readReturnPacket;
 	vector<unsigned> readReturnCountdown;
+	vector<Bank> banks;
 	vector<BankState> bankStates;
+
 };
 }
 #endif