Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/40337 )
Change subject: x86: Avoid including arch/x86/registers.hh.
......................................................................
x86: Avoid including arch/x86/registers.hh.
Don't include arch/x86/registers.hh when other, local headers have the
actual information we need.
Change-Id: I9a7407475b04231ac84d9c5bb299915eadec3589
---
M src/arch/x86/emulenv.hh
M src/arch/x86/isa.hh
M src/arch/x86/linux/se_workload.cc
M src/arch/x86/linux/syscalls.cc
M src/arch/x86/pseudo_inst_abi.hh
5 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/arch/x86/emulenv.hh b/src/arch/x86/emulenv.hh
index 1490326..cc45cc8 100644
--- a/src/arch/x86/emulenv.hh
+++ b/src/arch/x86/emulenv.hh
@@ -40,7 +40,6 @@
#include "arch/x86/regs/int.hh"
#include "arch/x86/regs/segment.hh"
-#include "arch/x86/registers.hh"
#include "arch/x86/types.hh"
namespace X86ISA
diff --git a/src/arch/x86/isa.hh b/src/arch/x86/isa.hh
index 2cbce6e..d7d9fa4 100644
--- a/src/arch/x86/isa.hh
+++ b/src/arch/x86/isa.hh
@@ -33,7 +33,6 @@
#include <string>
#include "arch/generic/isa.hh"
-#include "arch/x86/registers.hh"
#include "arch/x86/regs/float.hh"
#include "arch/x86/regs/misc.hh"
#include "base/types.hh"
diff --git a/src/arch/x86/linux/se_workload.cc
b/src/arch/x86/linux/se_workload.cc
index ee7bb1d..b1eef94 100644
--- a/src/arch/x86/linux/se_workload.cc
+++ b/src/arch/x86/linux/se_workload.cc
@@ -43,7 +43,7 @@
#include "arch/x86/linux/linux.hh"
#include "arch/x86/page_size.hh"
#include "arch/x86/process.hh"
-#include "arch/x86/registers.hh"
+#include "arch/x86/regs/int.hh"
#include "arch/x86/se_workload.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
diff --git a/src/arch/x86/linux/syscalls.cc b/src/arch/x86/linux/syscalls.cc
index 2431f87..194235d 100644
--- a/src/arch/x86/linux/syscalls.cc
+++ b/src/arch/x86/linux/syscalls.cc
@@ -29,7 +29,7 @@
#include "arch/x86/linux/linux.hh"
#include "arch/x86/process.hh"
-#include "arch/x86/registers.hh"
+#include "arch/x86/regs/misc.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
#include "kern/linux/linux.hh"
diff --git a/src/arch/x86/pseudo_inst_abi.hh
b/src/arch/x86/pseudo_inst_abi.hh
index 36e40db..04e8428 100644
--- a/src/arch/x86/pseudo_inst_abi.hh
+++ b/src/arch/x86/pseudo_inst_abi.hh
@@ -35,7 +35,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "arch/x86/registers.hh"
+#include "arch/x86/regs/int.hh"
#include "sim/guest_abi.hh"
struct X86PseudoInstABI
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40337
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I9a7407475b04231ac84d9c5bb299915eadec3589
Gerrit-Change-Number: 40337
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
