Revert "changed DRAMSim.h file to HBMSim.h for SST to be able to use both at the same time + changed ifdef MACROs"

This reverts commit b831299.

Author: pranith

AddressMapping.cpp

@@ -33,7 +33,7 @@
 
 using namespace std;
 
-namespace HBMSim {
+namespace DRAMSim {
 
 unsigned sliceLowerBits(uint64_t& addr, unsigned bits)
 {

AddressMapping.h

@@ -27,10 +27,10 @@
 *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *********************************************************************************/
-#ifndef HBMSIM_ADDRESS_MAPPING_H
-#define HBMSIM_ADDRESS_MAPPING_H
+#ifndef ADDRESS_MAPPING_H
+#define ADDRESS_MAPPING_H
 
-namespace HBMSim {
+namespace DRAMSim {
   void addressMapping(uint64_t addr, unsigned &chn, unsigned &rnk, unsigned &bnk, unsigned &row, 
       unsigned &col);
 }

BankState.cpp

@@ -31,7 +31,7 @@
 #include "BankState.h"
 
 using namespace std;
-using namespace HBMSim;
+using namespace DRAMSim;
 
 BankState::BankState():
     currentBankState(Idle),

BankState.h

@@ -28,13 +28,13 @@
 *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *********************************************************************************/
 
-#ifndef HBMSIM_BANKSTATE_H
-#define HBMSIM_BANKSTATE_H
+#ifndef BANKSTATE_H
+#define BANKSTATE_H
 
 #include "SystemConfiguration.h"
 #include "BusPacket.h"
 
-namespace HBMSim {
+namespace DRAMSim {
 enum CurrentBankState
 {
   Idle,

BusPacket.cpp

@@ -30,7 +30,7 @@
 
 #include "BusPacket.h"
 
-using namespace HBMSim;
+using namespace DRAMSim;
 using namespace std;
 
 BusPacket::BusPacket(BusPacketType packtype, uint64_t physicalAddr, 

BusPacket.h

@@ -28,12 +28,12 @@
 *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *********************************************************************************/
 
-#ifndef HBMSIM_BUSPACKET_H
-#define HBMSIM_BUSPACKET_H
+#ifndef BUSPACKET_H
+#define BUSPACKET_H
 
 #include "SystemConfiguration.h"
 
-namespace HBMSim {
+namespace DRAMSim {
 enum BusPacketType
 {
   READ,
@@ -71,7 +71,7 @@ class BusPacket
     uint64_t physicalAddress;
     void *data;
 }; //class BusPacket
-} //namespace HBMSim
+} //namespace DRAMSim
 
 #endif
 

Callback.h

@@ -32,10 +32,10 @@
 
 #include <stdint.h> // uint64_t
 
-#ifndef HBMSIM_CALLBACK_H
-#define HBMSIM_CALLBACK_H
+#ifndef CALLBACK_H
+#define CALLBACK_H
 
-namespace HBMSim
+namespace DRAMSim
 {
 
 template <typename ReturnT, typename Param1T, typename Param2T,
@@ -48,7 +48,7 @@ class CallbackBase
 };
 
 template <typename Return, typename Param1T, typename Param2T, typename Param3T>
-HBMSim::CallbackBase<Return,Param1T,Param2T,Param3T>::~CallbackBase() {}
+DRAMSim::CallbackBase<Return,Param1T,Param2T,Param3T>::~CallbackBase() {}
 
 template <typename ConsumerT, typename ReturnT,
 typename Param1T, typename Param2T, typename Param3T >
@@ -81,6 +81,6 @@ class Callback: public CallbackBase<ReturnT,Param1T,Param2T,Param3T>
 };
 
 typedef CallbackBase <void, unsigned, uint64_t, uint64_t> TransactionCompleteCB;
-} // namespace HBMSim
+} // namespace DRAMSim
 
 #endif

CommandQueue.cpp

@@ -32,7 +32,7 @@
 #include "MemoryController.h"
 #include <assert.h>
 
-using namespace HBMSim;
+using namespace DRAMSim;
 
 CommandQueue::CommandQueue(vector<vector<BankState>>& states) :
   bankStates(states),

CommandQueue.h

@@ -28,8 +28,8 @@
 *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *********************************************************************************/
 
-#ifndef HBMSIM_CMDQUEUE_H
-#define HBMSIM_CMDQUEUE_H
+#ifndef CMDQUEUE_H
+#define CMDQUEUE_H
 
 #include "BusPacket.h"
 #include "BankState.h"
@@ -39,7 +39,7 @@
 
 using namespace std;
 
-namespace HBMSim {
+namespace DRAMSim {
 class CommandQueue : public SimulatorObject
 {
   private:
@@ -93,7 +93,7 @@ class CommandQueue : public SimulatorObject
     vector<vector<unsigned>> tFAWCountdown;
     vector<vector<unsigned>> rowAccessCounters;
 }; //class CommandQueue
-} //namespace HBMSim
+} //namespace DRAMSim
 
 #endif
 

HBMSim.h renamed to DRAMSim.h

@@ -29,15 +29,15 @@
 *********************************************************************************/
 
 
-#ifndef HBMSIM_H
-#define HBMSIM_H
+#ifndef DRAMSIM_H
+#define DRAMSIM_H
 
 #include "Callback.h"
 #include <string>
 
 using std::string;
 
-namespace HBMSim 
+namespace DRAMSim 
 {
   class MultiChannelMemorySystem 
   {