From: Gabe Black <gabeblack@google.com>
Date: Thu, 9 Jan 2020 08:40:32 +0000 (-0800)
Subject: arch: Make the generic micropc enabled PCState set nupc to 1.
X-Git-Tag: v19.0.0.0~120
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=230a4bfd9c5a65a3b12226de486e05b566c7c006;p=gem5.git

arch: Make the generic micropc enabled PCState set nupc to 1.

The default constructor of the micropc enabled generic PCState class
set the next micropc to 0, when the non-default constructor and at
least the x86 initCPU utility function set it to 1. This makes more
sense since either the micropc doesn't matter as a concept if the
instruction isn't microcoded, or, unless redirected by a micropc
branch, you're going to want to execute the next microop and not just
repeat the first one.

Change-Id: I418ea986a071453563c4c8aad4fc4eb4f7beb641
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/24184
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/arch/generic/types.hh b/src/arch/generic/types.hh
index 7f9f93f42..64fef6413 100644
--- a/src/arch/generic/types.hh
+++ b/src/arch/generic/types.hh
@@ -222,7 +222,7 @@ class UPCState : public SimplePCState<MachInst>
         nupc(1);
     }
 
-    UPCState() : _upc(0), _nupc(0) {}
+    UPCState() : _upc(0), _nupc(1) {}
     UPCState(Addr val) : _upc(0), _nupc(0) { set(val); }
 
     bool