misc: Merge hotfix v20.0.0.2 into develop

Change-Id: Ia0ed6bfb70e2ebcb22274569556d690e315702bd

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 2b88db757ecb810459c1f63c1758ad3f67bf80d8..3542de9fe7c2361cd3a8ae89e6b7e4fa5737cd11 100644 (file)
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,3 +1,7 @@
+# Version 20.0.0.2
+
+**[HOTFIX]** A patch was applied to fix the RubyPrefetcher with MESI_Three_Level. Prior to this fix a segfault occurred.
+
 # Version 20.0.0.1
 
 **[HOTFIX]** A fix was applied to stop incorrect clock frequences being reported due to rounding errors.

diff --git a/src/Doxyfile b/src/Doxyfile
index 178890020c9f6d7e39395866f9b60801cb2b36dc..cd1a9474e1aa1dfbc1128cdfa5a89234397339c4 100644 (file)
--- a/src/Doxyfile
+++ b/src/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = gem5
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = v20.0.0.1
+PROJECT_NUMBER         = v20.0.0.2
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

diff --git a/src/base/version.cc b/src/base/version.cc
index 2040268402eff6d8dc82922f653fd9bd15d91845..7e89b992ee4794258cd510a48ad024bc19741493 100644 (file)
--- a/src/base/version.cc
+++ b/src/base/version.cc
@@ -26,4 +26,4 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-const char *gem5Version = "20.0.0.1";
+const char *gem5Version = "20.0.0.2";

diff --git a/src/mem/slicc/symbols/StateMachine.py b/src/mem/slicc/symbols/StateMachine.py
index 8e3a1f84b65214900b4a39e7491933d1852dd31a..2e9700fcfc8e83961e015480eddd9cd82cbcac1e 100644 (file)
--- a/src/mem/slicc/symbols/StateMachine.py
+++ b/src/mem/slicc/symbols/StateMachine.py
@@ -87,7 +87,7 @@ class StateMachine(Symbol):
 
             self.symtab.registerSym(param.ident, var)
 
-            if str(param.type_ast.type) == "Prefetcher":
+            if str(param.type_ast.type) == "RubyPrefetcher":
                 self.prefetchers.append(var)
 
         self.states = OrderedDict()