From 8af2f3b89859233d6f1de819599bc749830a7086 Mon Sep 17 00:00:00 2001
From: Robert Gernhardt <robertgernha@gmail.com>
Date: Mon, 28 Jul 2014 10:53:17 +0200
Subject: [PATCH] renamed colum to column in addressmapping. Error with large
 values on data bus should be resolved

---
 dram/resources/configs/amconfigs/am_ddr4.xml         |  2 +-
 dram/resources/configs/amconfigs/am_highHits.xml     |  2 +-
 dram/resources/configs/amconfigs/am_highPara.xml     |  2 +-
 dram/resources/configs/amconfigs/am_lowHits.xml      |  2 +-
 dram/resources/configs/amconfigs/am_lowPara.xml      |  2 +-
 .../configs/amconfigs/am_wideioFourBanks.xml         |  2 +-
 dram/src/common/TlmRecorder.cpp                      |  4 ++--
 dram/src/simulation/Arbiter.h                        | 12 ++++++------
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dram/resources/configs/amconfigs/am_ddr4.xml b/dram/resources/configs/amconfigs/am_ddr4.xml
index 22bf01b2..a53b0970 100755
--- a/dram/resources/configs/amconfigs/am_ddr4.xml
+++ b/dram/resources/configs/amconfigs/am_ddr4.xml
@@ -4,7 +4,7 @@
  <dramconfig>
 	<addressmap length="32">
 		<row   from="19" to="31" />		
-		<colum  from="9" to="18" />
+		<column  from="9" to="18" />
 		<bank   from="5" to="8" />
 	</addressmap>
 </dramconfig>
diff --git a/dram/resources/configs/amconfigs/am_highHits.xml b/dram/resources/configs/amconfigs/am_highHits.xml
index 4a724150..a58f41db 100644
--- a/dram/resources/configs/amconfigs/am_highHits.xml
+++ b/dram/resources/configs/amconfigs/am_highHits.xml
@@ -4,6 +4,6 @@
 <addressmap length="32">
 		<row   from="19" to="31" />		
 		<bank  from="15" to="18" />
-		<colum from="5" to="14" />
+		<column from="5" to="14" />
 	</addressmap>
 </dramconfig>
diff --git a/dram/resources/configs/amconfigs/am_highPara.xml b/dram/resources/configs/amconfigs/am_highPara.xml
index 20855861..da617801 100755
--- a/dram/resources/configs/amconfigs/am_highPara.xml
+++ b/dram/resources/configs/amconfigs/am_highPara.xml
@@ -4,7 +4,7 @@
  <dramconfig>
 	<addressmap length="32">
 		<row   from="19" to="31" />		
-		<colum  from="9" to="18" />
+		<column  from="9" to="18" />
 		<bank   from="5" to="8" />
 	</addressmap>
 </dramconfig>
diff --git a/dram/resources/configs/amconfigs/am_lowHits.xml b/dram/resources/configs/amconfigs/am_lowHits.xml
index d54cd0b3..4e61ed44 100755
--- a/dram/resources/configs/amconfigs/am_lowHits.xml
+++ b/dram/resources/configs/amconfigs/am_lowHits.xml
@@ -3,7 +3,7 @@
 <!-- should have high bank parallelism with a low hit rate -->
  <dramconfig>
 	<addressmap length="32">
-		<colum   from="24" to="31" />		
+		<column   from="24" to="31" />		
 		<row   from="9" to="23" />
 		<bank  from="5" to="8" />
 	</addressmap>
diff --git a/dram/resources/configs/amconfigs/am_lowPara.xml b/dram/resources/configs/amconfigs/am_lowPara.xml
index eb363f82..c73ccdd4 100755
--- a/dram/resources/configs/amconfigs/am_lowPara.xml
+++ b/dram/resources/configs/amconfigs/am_lowPara.xml
@@ -5,7 +5,7 @@
 	<addressmap length="32">
 		<bank   from="30" to="31" />		
 		<row  from="15" to="29" />
-		<colum from="5" to="14" />
+		<column from="5" to="14" />
 	</addressmap>
 </dramconfig>
 
diff --git a/dram/resources/configs/amconfigs/am_wideioFourBanks.xml b/dram/resources/configs/amconfigs/am_wideioFourBanks.xml
index d24cfdb2..6c575c0f 100755
--- a/dram/resources/configs/amconfigs/am_wideioFourBanks.xml
+++ b/dram/resources/configs/amconfigs/am_wideioFourBanks.xml
@@ -15,7 +15,7 @@
 		<channel from="27" to="28" />
 		<row   from="13" to="26" />		
 		<bank  from="11" to="12" />
-		<colum from="4" to="10" />
+		<column from="4" to="10" />
 		<bytes from="0" to="3" />   
 		<!-- <channel from="27" to="28" />
 		<row   from="14" to="26" />		
diff --git a/dram/src/common/TlmRecorder.cpp b/dram/src/common/TlmRecorder.cpp
index 1b69b89a..e6bad2d4 100644
--- a/dram/src/common/TlmRecorder.cpp
+++ b/dram/src/common/TlmRecorder.cpp
@@ -257,8 +257,8 @@ void TlmRecorder::insertTransactionInDB(Transaction& recordingData)
     sqlite3_bind_int(insertTransactionStatement, 8, recordingData.dramExtension.getBankGroup().ID());
     sqlite3_bind_int(insertTransactionStatement, 9, recordingData.dramExtension.getRow().ID());
     sqlite3_bind_int(insertTransactionStatement, 10, recordingData.dramExtension.getColumn().ID());
-    sqlite3_bind_int(insertTransactionStatement, 11, recordingData.timeOnDataStrobe.start.value());
-    sqlite3_bind_int(insertTransactionStatement, 12, recordingData.timeOnDataStrobe.end.value());
+    sqlite3_bind_int64(insertTransactionStatement, 11, recordingData.timeOnDataStrobe.start.value());
+    sqlite3_bind_int64(insertTransactionStatement, 12, recordingData.timeOnDataStrobe.end.value());
     sqlite3_bind_int64(insertTransactionStatement, 13, recordingData.timeOfGeneration.value());
 
     executeSqlStatement(insertTransactionStatement);
diff --git a/dram/src/simulation/Arbiter.h b/dram/src/simulation/Arbiter.h
index 72184c3a..410ea46c 100644
--- a/dram/src/simulation/Arbiter.h
+++ b/dram/src/simulation/Arbiter.h
@@ -56,7 +56,7 @@ private:
         return TLM_ACCEPTED;
     }
 
-    // Initiated by .stl players
+    // Initiated by senders
     tlm_sync_enum nb_transport_fw(int socketId, tlm_generic_payload& payload, tlm_phase& phase,
             sc_time& fwDelay)
     {
@@ -74,7 +74,7 @@ private:
 
     void peqCallback(tlm_generic_payload& payload, const tlm_phase& phase)
     {
-        //Phases initiated by .stl players
+        //Phases initiated by intiator side
         if (phase == BEGIN_REQ)
         {
             if(channelIsFree)
@@ -93,11 +93,11 @@ private:
             sendToChannel(payload, phase, SC_ZERO_TIME );
         }
 
-        //Phases initiated by dram backend
+        //Phases initiated by dram side
         else if (phase == END_REQ)
         {
             channelIsFree = true;
-            sendToTraceplayer(DramExtension::getExtension(payload).getThread().ID()-1, payload, phase, SC_ZERO_TIME);
+            sendToInitiator(DramExtension::getExtension(payload).getThread().ID()-1, payload, phase, SC_ZERO_TIME);
 
             if(!backpressure.empty())
             {
@@ -109,7 +109,7 @@ private:
         }
         else if (phase == BEGIN_RESP)
         {
-            sendToTraceplayer(DramExtension::getExtension(payload).getThread().ID()-1, payload, phase, SC_ZERO_TIME);
+            sendToInitiator(DramExtension::getExtension(payload).getThread().ID()-1, payload, phase, SC_ZERO_TIME);
         }
 
         else
@@ -125,7 +125,7 @@ private:
         iSocket->nb_transport_fw(payload, TPhase, TDelay);
     }
 
-    void sendToTraceplayer(unsigned int id, tlm_generic_payload& payload, const tlm_phase& phase, const sc_time& delay)
+    void sendToInitiator(unsigned int id, tlm_generic_payload& payload, const tlm_phase& phase, const sc_time& delay)
     {
         tlm_phase TPhase = phase;
         sc_time TDelay = delay;