More README tweaks, GPL tweaks

Paul Rosenfeld · Paul Rosenfeld · commit 39d772070694 · 2010-05-05T23:47:14.000-04:00
diff --git a/Bank.cpp b/Bank.cpp
@@ -3,6 +3,7 @@
 *	 
 *	 Copyright (C) 2010   	Elliott Cooper-Balis
 *									Paul Rosenfeld 
+*									Bruce Jacob
 *									University of Maryland
 *
 *	 This program is free software: you can redistribute it and/or modify
@@ -24,6 +25,7 @@
 
 
 
+
 //Bank.cpp
 //
 //Class file for bank object
diff --git a/Bank.h b/Bank.h
@@ -3,6 +3,7 @@
 *	 
 *	 Copyright (C) 2010   	Elliott Cooper-Balis
 *									Paul Rosenfeld 
+*									Bruce Jacob
 *									University of Maryland
 *
 *	 This program is free software: you can redistribute it and/or modify
@@ -24,6 +25,7 @@
 
 
 
+
 #ifndef BANK_H
 #define BANK_H
 
diff --git a/BankState.cpp b/BankState.cpp
@@ -3,6 +3,7 @@
 *	 
 *	 Copyright (C) 2010   	Elliott Cooper-Balis
 *									Paul Rosenfeld 
+*									Bruce Jacob
 *									University of Maryland
 *
 *	 This program is free software: you can redistribute it and/or modify
@@ -24,6 +25,7 @@
 
 
 
+
 //BankState.cpp
 //
 //Class file for bank state object
diff --git a/BankState.h b/BankState.h
@@ -3,6 +3,7 @@
 *	 
 *	 Copyright (C) 2010   	Elliott Cooper-Balis
 *									Paul Rosenfeld 
+*									Bruce Jacob
 *									University of Maryland
 *
 *	 This program is free software: you can redistribute it and/or modify
@@ -24,6 +25,7 @@
 
 
 
+
 #ifndef BANKSTATE_H
 #define BANKSTATE_H
 
diff --git a/BusPacket.cpp b/BusPacket.cpp
@@ -3,6 +3,7 @@
 *	 
 *	 Copyright (C) 2010   	Elliott Cooper-Balis
 *									Paul Rosenfeld 
+*									Bruce Jacob
 *									University of Maryland
 *
 *	 This program is free software: you can redistribute it and/or modify
@@ -24,6 +25,7 @@
 
 
 
+
 //BusPacket.cpp
 //
 //Class file for bus packet object
diff --git a/BusPacket.h b/BusPacket.h
@@ -3,6 +3,7 @@
 *	 
 *	 Copyright (C) 2010   	Elliott Cooper-Balis
 *									Paul Rosenfeld 
+*									Bruce Jacob
 *									University of Maryland
 *
 *	 This program is free software: you can redistribute it and/or modify
@@ -24,6 +25,7 @@
 
 
 
+
 #ifndef BUSPACKET_H
 #define BUSPACKET_H
 //BusPacket.h
diff --git a/Callback.h b/Callback.h
@@ -3,6 +3,7 @@
 *	 
 *	 Copyright (C) 2010   	Elliott Cooper-Balis
 *									Paul Rosenfeld 
+*									Bruce Jacob
 *									University of Maryland
 *
 *	 This program is free software: you can redistribute it and/or modify
@@ -25,6 +26,7 @@
 
 
 
+
 #ifndef CALLBACK_H
 #define CALLBACK_H
 
diff --git a/CommandQueue.cpp b/CommandQueue.cpp
@@ -3,6 +3,7 @@
 *	 
 *	 Copyright (C) 2010   	Elliott Cooper-Balis
 *									Paul Rosenfeld 
+*									Bruce Jacob
 *									University of Maryland
 *
 *	 This program is free software: you can redistribute it and/or modify
@@ -24,6 +25,7 @@
 
 
 
+
 //CommandQueue.cpp
 //
 //Class file for command queue object
diff --git a/CommandQueue.h b/CommandQueue.h
@@ -3,6 +3,7 @@
 *	 
 *	 Copyright (C) 2010   	Elliott Cooper-Balis
 *									Paul Rosenfeld 
+*									Bruce Jacob
 *									University of Maryland
 *
 *	 This program is free software: you can redistribute it and/or modify
@@ -24,6 +25,7 @@
 
 
 
+
 #ifndef CMDQUEUE_H
 #define CMDQUEUE_H
 
diff --git a/DRAMSim.h b/DRAMSim.h
@@ -3,6 +3,7 @@
 *	 
 *	 Copyright (C) 2010   	Elliott Cooper-Balis
 *									Paul Rosenfeld 
+*									Bruce Jacob
 *									University of Maryland
 *
 *	 This program is free software: you can redistribute it and/or modify
@@ -24,6 +25,7 @@
 
 
 
+
 #ifndef DRAMSIM_H
 #define DRAMSIM_H
 /*
diff --git a/IniReader.cpp b/IniReader.cpp
@@ -3,6 +3,7 @@
 *	 
 *	 Copyright (C) 2010   	Elliott Cooper-Balis
 *									Paul Rosenfeld 
+*									Bruce Jacob
 *									University of Maryland
 *
 *	 This program is free software: you can redistribute it and/or modify
@@ -24,6 +25,7 @@
 
 
 
+
 #include "IniReader.h"
 
 using namespace std;
diff --git a/IniReader.h b/IniReader.h
@@ -3,6 +3,7 @@
 *	 
 *	 Copyright (C) 2010   	Elliott Cooper-Balis
 *									Paul Rosenfeld 
+*									Bruce Jacob
 *									University of Maryland
 *
 *	 This program is free software: you can redistribute it and/or modify
@@ -24,6 +25,7 @@
 
 
 
+
 #ifndef INIREADER_H
 #define INIREADER_H
 
diff --git a/MemoryController.cpp b/MemoryController.cpp
@@ -3,6 +3,7 @@
 *	 
 *	 Copyright (C) 2010   	Elliott Cooper-Balis
 *									Paul Rosenfeld 
+*									Bruce Jacob
 *									University of Maryland
 *
 *	 This program is free software: you can redistribute it and/or modify
@@ -24,6 +25,7 @@
 
 
 
+
 //MemoryController.cpp
 //
 //Class file for memory controller object
diff --git a/MemoryController.h b/MemoryController.h
@@ -3,6 +3,7 @@
 *	 
 *	 Copyright (C) 2010   	Elliott Cooper-Balis
 *									Paul Rosenfeld 
+*									Bruce Jacob
 *									University of Maryland
 *
 *	 This program is free software: you can redistribute it and/or modify
@@ -24,6 +25,7 @@
 
 
 
+
 #ifndef MEMORYCONTROLLER_H
 #define MEMORYCONTROLLER_H
 
diff --git a/MemorySystem.cpp b/MemorySystem.cpp
@@ -3,6 +3,7 @@
 *	 
 *	 Copyright (C) 2010   	Elliott Cooper-Balis
 *									Paul Rosenfeld 
+*									Bruce Jacob
 *									University of Maryland
 *
 *	 This program is free software: you can redistribute it and/or modify
@@ -24,6 +25,7 @@
 
 
 
+
 //MemorySystem.cpp
 //
 //Class file for JEDEC memory system wrapper
diff --git a/MemorySystem.h b/MemorySystem.h
@@ -3,6 +3,7 @@
 *	 
 *	 Copyright (C) 2010   	Elliott Cooper-Balis
 *									Paul Rosenfeld 
+*									Bruce Jacob
 *									University of Maryland
 *
 *	 This program is free software: you can redistribute it and/or modify
@@ -24,6 +25,7 @@
 
 
 
+
 #ifndef MEMORYSYSTEM_H
 #define MEMORYSYSTEM_H
 
diff --git a/PrintMacros.h b/PrintMacros.h
@@ -3,6 +3,7 @@
 *	 
 *	 Copyright (C) 2010   	Elliott Cooper-Balis
 *									Paul Rosenfeld 
+*									Bruce Jacob
 *									University of Maryland
 *
 *	 This program is free software: you can redistribute it and/or modify
@@ -21,6 +22,7 @@
 *****************************************************************************/
 
 
+
 #ifndef PRINT_MACROS_H
 #define PRINT_MACROS_H
 
diff --git a/README.pdf b/README.pdf
diff --git a/README.tex b/README.tex
@@ -12,6 +12,7 @@
 \title{DRAMSim2}
 \author{Elliott Cooper-Balis \\
 			Paul Rosenfeld \\
+			Bruce Jacob \\
 			University of Maryland \\
 			\texttt{\footnotesize dramninjas \textit{[at]} gmail \textit{[dot]} com}
 }
@@ -36,7 +37,7 @@ \section{Getting DRAMSim2}
 
 DRAMSim2 is available on \href{http://github.com/dramninjasUMD}{github}. If you have git installed you can clone our repository by typing:\\
 
-\texttt{\$ git clone http://github.com/dramninjasUMD/DRAMSim2.git }
+\texttt{\$ git clone git://github.com/dramninjasUMD/DRAMSim2.git }
 
 
 
diff --git a/README.txt b/README.txt
@@ -1,14 +1,13 @@
-DRAMSim2
-----------------------------------------
+DRAMSim2: A cycle accurate DRAM Simulator
+================================================================================
 Elliott Cooper-Balis
 Paul Rosenfeld
+Bruce Jacob
 University of Maryland
 dramninjas [at] gmail [dot] com
-----------------------------------------
 
 
-
-1 About DRAMSim2
+1 About DRAMSim2 --------------------------------------------------------------------------------
 
 DRAMSim2 is a cycle accurate model of a DRAM memory controller, the DRAM modules which comprise
 system storage, and the buses by which they communicate.
@@ -17,14 +16,13 @@ simple interface which allows it to be CPU simulator agnostic and should to work
 section 4.2). This core has no external run time or build time dependencies and has been tested with g++ on
 Linux as well as g++ on Cygwin on Windows.
 
-
-2 Getting DRAMSim2 ------------------
+2 Getting DRAMSim2--------------------------------------------------------------------------------
 
 DRAMSim2 is available on github. If you have git installed you can clone our repository by typing:
 
-$ git clone http://github.com/dramninjasUMD/DRAMSim2.git
+$ git clone git://github.com/dramninjasUMD/DRAMSim2.git
 
-3 Building DRAMSim2 ------------------
+3 Building DRAMSim2--------------------------------------------------------------------------------
 
 To build an optimized standalone trace-based simulator called DRAMSim simply type:
 $ make
@@ -35,9 +33,9 @@ To build the DRAMSim2 library, type:
 $ make libdramsim.so
 
 
-4 Running DRAMSim2 -------------------
+4 Running DRAMSim2--------------------------------------------------------------------------------
 
-4.1 Trace-Based Simulation -----------
+4.1 Trace-Based Simulation--------------------------------------------------------------------------------
 In standalone mode, DRAMSim2 can simulate memory system traces. While traces are not as accurate as a
 real CPU model driving the memory model, they are convenient since they can be generated in a number of
 different ways (instrumentation, hardware traces, CPU simulation, etc.) and reused.
@@ -72,7 +70,7 @@ ton add support for your own trace formats.
 The prefix of the filename determines which type of trace this function will use (ex: k6 foo.trc) will use the k6
 format in parseTraceFileLine().
 
-4.2 Library Interface
+4.2 Library Interface--------------------------------------------------------------------------------
 
 In addition to simulating memory traces, DRAMSim2 can also be built as a dynamic shared library which
 is convenient for connecting it to CPU simulators or other custom front ends. A MemorySystem object
@@ -81,8 +79,6 @@ comprise DRAMSim2 can be seen in figure 1. A simple example application is provi
 directory. At this time we have plans to provide code to integrate DRAMSim2 into MARSSx86, SST, and
 (eventually) M5.
 
-5 Example Output --------------------------------------
-
 The verbosity of the DRAMSim2 can be customized in the system.ini file by turning the various debug flags on
 or off.
 Below, we have provided a detailed explanation of the simulator output. With all DEBUG flags enabled, the
@@ -190,11 +186,11 @@ The state of each bank in the system is also displayed:
 Banks can be in many states, including idle, row active (shown with the row that is active), refreshing, or
 precharging. These states will update based on the commands being sent by the controller.
 
-6 Results Output ---------------------------------
+6 Results Output--------------------------------------------------------------------------------
 
 In addition to printing memory statistics and debug information to standard out, DRAMSim2 also produces a
 'vis' file in the results/ directory. A vis file is essentially a summary of relevant statistics that is generated per
-epoch (the number of cycles per epoch can be set by changing the EPOCHCOUNT parameter in the system.ini
+epoch (the number of cycles per epoch can be set by changing the EPOCH_COUNT parameter in the system.ini
 file).
 We are currently working on DRAMVis, which is a cross-platform viewer which parses the vis file and generates
 graphs that can be used to analyze and compare results.
diff --git a/Rank.cpp b/Rank.cpp
@@ -3,6 +3,7 @@
 *	 
 *	 Copyright (C) 2010   	Elliott Cooper-Balis
 *									Paul Rosenfeld 
+*									Bruce Jacob
 *									University of Maryland
 *
 *	 This program is free software: you can redistribute it and/or modify
@@ -24,6 +25,7 @@
 
 
 
+
 #include "Rank.h"
 #include "MemoryController.h"
 
diff --git a/Rank.h b/Rank.h
diff --git a/SimulatorObject.cpp b/SimulatorObject.cpp
diff --git a/SimulatorObject.h b/SimulatorObject.h
diff --git a/SystemConfiguration.h b/SystemConfiguration.h
diff --git a/TraceBasedSim.cpp b/TraceBasedSim.cpp
diff --git a/Transaction.cpp b/Transaction.cpp
diff --git a/Transaction.h b/Transaction.h
diff --git a/example_app/dramsim_test.cpp b/example_app/dramsim_test.cpp
diff --git a/example_app/dramsim_test.h b/example_app/dramsim_test.h

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (C) 2010 Elliott Cooper-Balis`
`5`	`5`	`* Paul Rosenfeld`
	`6`	`+* Bruce Jacob`
`6`	`7`	`* University of Maryland`
`7`	`8`	`*`
`8`	`9`	`* This program is free software: you can redistribute it and/or modify`
`@@ -24,6 +25,7 @@`
`24`	`25`
`25`	`26`
`26`	`27`
	`28`	`+`
`27`	`29`	`//Bank.cpp`
`28`	`30`	`//`
`29`	`31`	`//Class file for bank object`