X86: Create a directory for files that define register indexes.

This is to help tidy up arch/x86. These files should not be used external to
the ISA.

--HG--
rename : src/arch/x86/apicregs.hh => src/arch/x86/regs/apic.hh
rename : src/arch/x86/floatregs.hh => src/arch/x86/regs/float.hh
rename : src/arch/x86/intregs.hh => src/arch/x86/regs/int.hh
rename : src/arch/x86/miscregs.hh => src/arch/x86/regs/misc.hh
rename : src/arch/x86/segmentregs.hh => src/arch/x86/regs/segment.hh

28 files changed, 34 insertions, 34 deletions

diff --git a/src/arch/x86/emulenv.hh b/src/arch/x86/emulenv.hh
index b8b6cd6b6..a745fb539 100644
--- a/src/arch/x86/emulenv.hh
+++ b/src/arch/x86/emulenv.hh
@@ -40,9 +40,9 @@
 #ifndef __ARCH_X86_EMULENV_HH__
 #define __ARCH_X86_EMULENV_HH__
 
-#include "arch/x86/intregs.hh"
-#include "arch/x86/segmentregs.hh"
 #include "arch/x86/registers.hh"
+#include "arch/x86/regs/int.hh"
+#include "arch/x86/regs/segment.hh"
 #include "arch/x86/types.hh"
 
 namespace X86ISA
diff --git a/src/arch/x86/insts/microfpop.cc b/src/arch/x86/insts/microfpop.cc
index 281637db5..94194974a 100644
--- a/src/arch/x86/insts/microfpop.cc
+++ b/src/arch/x86/insts/microfpop.cc
@@ -38,7 +38,7 @@
  */
 
 #include "arch/x86/insts/microfpop.hh"
-#include "arch/x86/miscregs.hh"
+#include "arch/x86/regs/misc.hh"
 #include <string>
 
 namespace X86ISA
diff --git a/src/arch/x86/insts/micromediaop.cc b/src/arch/x86/insts/micromediaop.cc
index 07ae360ee..2ed5df184 100644
--- a/src/arch/x86/insts/micromediaop.cc
+++ b/src/arch/x86/insts/micromediaop.cc
@@ -29,7 +29,7 @@
  */
 
 #include "arch/x86/insts/micromediaop.hh"
-#include "arch/x86/miscregs.hh"
+#include "arch/x86/regs/misc.hh"
 #include <string>
 
 namespace X86ISA
diff --git a/src/arch/x86/insts/microop.cc b/src/arch/x86/insts/microop.cc
index 22b069c2a..4f464927a 100644
--- a/src/arch/x86/insts/microop.cc
+++ b/src/arch/x86/insts/microop.cc
@@ -38,7 +38,7 @@
  */
 
 #include "arch/x86/insts/microop.hh"
-#include "arch/x86/miscregs.hh"
+#include "arch/x86/regs/misc.hh"
 
 namespace X86ISA
 {
diff --git a/src/arch/x86/insts/microregop.cc b/src/arch/x86/insts/microregop.cc
index 65ba019f0..56ac4e946 100644
--- a/src/arch/x86/insts/microregop.cc
+++ b/src/arch/x86/insts/microregop.cc
@@ -38,7 +38,7 @@
  */
 
 #include "arch/x86/insts/microregop.hh"
-#include "arch/x86/miscregs.hh"
+#include "arch/x86/regs/misc.hh"
 #include "base/condcodes.hh"
 #include <string>
 
diff --git a/src/arch/x86/insts/static_inst.cc b/src/arch/x86/insts/static_inst.cc
index 621cf859d..29957e121 100644
--- a/src/arch/x86/insts/static_inst.cc
+++ b/src/arch/x86/insts/static_inst.cc
@@ -38,7 +38,7 @@
  */
 
 #include "arch/x86/insts/static_inst.hh"
-#include "arch/x86/segmentregs.hh"
+#include "arch/x86/regs/segment.hh"
 
 namespace X86ISA
 {
diff --git a/src/arch/x86/interrupts.cc b/src/arch/x86/interrupts.cc
index 714a4a626..cc1d442fe 100644
--- a/src/arch/x86/interrupts.cc
+++ b/src/arch/x86/interrupts.cc
@@ -37,9 +37,9 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/apicregs.hh"
 #include "arch/x86/interrupts.hh"
 #include "arch/x86/intmessage.hh"
+#include "arch/x86/regs/apic.hh"
 #include "cpu/base.hh"
 #include "dev/x86/i82094aa.hh"
 #include "dev/x86/pc.hh"
diff --git a/src/arch/x86/interrupts.hh b/src/arch/x86/interrupts.hh
index 6b5215135..55651bf3b 100644
--- a/src/arch/x86/interrupts.hh
+++ b/src/arch/x86/interrupts.hh
@@ -40,9 +40,9 @@
 #ifndef __ARCH_X86_INTERRUPTS_HH__
 #define __ARCH_X86_INTERRUPTS_HH__
 
-#include "arch/x86/apicregs.hh"
 #include "arch/x86/faults.hh"
 #include "arch/x86/intmessage.hh"
+#include "arch/x86/regs/apic.hh"
 #include "base/bitfield.hh"
 #include "cpu/thread_context.hh"
 #include "dev/io_device.hh"
diff --git a/src/arch/x86/isa.hh b/src/arch/x86/isa.hh
index 9a1880062..c6dea8876 100644
--- a/src/arch/x86/isa.hh
+++ b/src/arch/x86/isa.hh
@@ -31,9 +31,9 @@
 #ifndef __ARCH_X86_ISA_HH__
 #define __ARCH_X86_ISA_HH__
 
-#include "arch/x86/floatregs.hh"
-#include "arch/x86/miscregs.hh"
 #include "arch/x86/registers.hh"
+#include "arch/x86/regs/float.hh"
+#include "arch/x86/regs/misc.hh"
 #include "base/types.hh"
 
 #include <string>
diff --git a/src/arch/x86/isa/includes.isa b/src/arch/x86/isa/includes.isa
index 8c9e29973..58b1fbc62 100644
--- a/src/arch/x86/isa/includes.isa
+++ b/src/arch/x86/isa/includes.isa
@@ -73,10 +73,10 @@ using X86ISA::InstRegIndex;
 
 output decoder {{
 #include "arch/x86/faults.hh"
-#include "arch/x86/floatregs.hh"
 #include "arch/x86/microcode_rom.hh"
-#include "arch/x86/miscregs.hh"
-#include "arch/x86/segmentregs.hh"
+#include "arch/x86/regs/float.hh"
+#include "arch/x86/regs/misc.hh"
+#include "arch/x86/regs/segment.hh"
 #include "arch/x86/tlb.hh"
 #include "base/cprintf.hh"
 #include "base/loader/symtab.hh"
@@ -110,7 +110,7 @@ output exec {{
 #include <cmath>
 #include "arch/x86/cpuid.hh"
 #include "arch/x86/faults.hh"
-#include "arch/x86/miscregs.hh"
+#include "arch/x86/regs/misc.hh"
 #include "arch/x86/tlb.hh"
 #include "base/bigint.hh"
 #include "base/condcodes.hh"
diff --git a/src/arch/x86/linux/syscalls.cc b/src/arch/x86/linux/syscalls.cc
index e223d962f..87cddba4d 100644
--- a/src/arch/x86/linux/syscalls.cc
+++ b/src/arch/x86/linux/syscalls.cc
@@ -39,7 +39,7 @@
 
 #include "arch/x86/linux/process.hh"
 #include "arch/x86/linux/linux.hh"
-#include "arch/x86/miscregs.hh"
+#include "arch/x86/regs/misc.hh"
 #include "kern/linux/linux.hh"
 #include "sim/syscall_emul.hh"
 
diff --git a/src/arch/x86/linux/system.cc b/src/arch/x86/linux/system.cc
index 1a113d365..9827638e7 100644
--- a/src/arch/x86/linux/system.cc
+++ b/src/arch/x86/linux/system.cc
@@ -37,8 +37,8 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/intregs.hh"
 #include "arch/x86/linux/system.hh"
+#include "arch/x86/regs/int.hh"
 #include "arch/vtophys.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
diff --git a/src/arch/x86/mmaped_ipr.hh b/src/arch/x86/mmaped_ipr.hh
index 36a61f1bc..82fe95cef 100644
--- a/src/arch/x86/mmaped_ipr.hh
+++ b/src/arch/x86/mmaped_ipr.hh
@@ -46,7 +46,7 @@
  * ISA-specific helper functions for memory mapped IPR accesses.
  */
 
-#include "arch/x86/miscregs.hh"
+#include "arch/x86/regs/misc.hh"
 #include "config/full_system.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
diff --git a/src/arch/x86/nativetrace.cc b/src/arch/x86/nativetrace.cc
index 1ce7505ad..3da2ecb13 100644
--- a/src/arch/x86/nativetrace.cc
+++ b/src/arch/x86/nativetrace.cc
@@ -29,9 +29,9 @@
  */
 
 #include "arch/x86/isa_traits.hh"
-#include "arch/x86/floatregs.hh"
-#include "arch/x86/intregs.hh"
 #include "arch/x86/nativetrace.hh"
+#include "arch/x86/regs/float.hh"
+#include "arch/x86/regs/int.hh"
 #include "cpu/thread_context.hh"
 #include "params/X86NativeTrace.hh"
 
diff --git a/src/arch/x86/predecoder.cc b/src/arch/x86/predecoder.cc
index 817544d5d..0318230e5 100644
--- a/src/arch/x86/predecoder.cc
+++ b/src/arch/x86/predecoder.cc
@@ -37,7 +37,7 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/miscregs.hh"
+#include "arch/x86/regs/misc.hh"
 #include "arch/x86/predecoder.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
diff --git a/src/arch/x86/predecoder.hh b/src/arch/x86/predecoder.hh
index fe55f79f3..5b38402e0 100644
--- a/src/arch/x86/predecoder.hh
+++ b/src/arch/x86/predecoder.hh
@@ -43,7 +43,7 @@
 #include <cassert>
 
 #include "arch/x86/types.hh"
-#include "arch/x86/miscregs.hh"
+#include "arch/x86/regs/misc.hh"
 #include "base/bitfield.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc
index 02cd45478..946a7cbe1 100644
--- a/src/arch/x86/process.cc
+++ b/src/arch/x86/process.cc
@@ -42,9 +42,9 @@
  */
 
 #include "arch/x86/isa_traits.hh"
-#include "arch/x86/miscregs.hh"
 #include "arch/x86/process.hh"
-#include "arch/x86/segmentregs.hh"
+#include "arch/x86/regs/misc.hh"
+#include "arch/x86/regs/segment.hh"
 #include "arch/x86/types.hh"
 #include "base/loader/object_file.hh"
 #include "base/loader/elf_object.hh"
diff --git a/src/arch/x86/registers.hh b/src/arch/x86/registers.hh
index de3186b27..e14b9a1ba 100644
--- a/src/arch/x86/registers.hh
+++ b/src/arch/x86/registers.hh
@@ -40,9 +40,9 @@
 #ifndef __ARCH_X86_REGISTERS_HH__
 #define __ARCH_X86_REGISTERS_HH__
 
-#include "arch/x86/intregs.hh"
 #include "arch/x86/max_inst_regs.hh"
-#include "arch/x86/miscregs.hh"
+#include "arch/x86/regs/int.hh"
+#include "arch/x86/regs/misc.hh"
 #include "arch/x86/x86_traits.hh"
 
 namespace X86ISA
diff --git a/src/arch/x86/apicregs.hh b/src/arch/x86/regs/apic.hh
index dfea2650f..dfea2650f 100644
--- a/src/arch/x86/apicregs.hh
+++ b/src/arch/x86/regs/apic.hh
diff --git a/src/arch/x86/floatregs.hh b/src/arch/x86/regs/float.hh
index 5ac33c40f..5ac33c40f 100644
--- a/src/arch/x86/floatregs.hh
+++ b/src/arch/x86/regs/float.hh
diff --git a/src/arch/x86/intregs.hh b/src/arch/x86/regs/int.hh
index 2a1371051..2a1371051 100644
--- a/src/arch/x86/intregs.hh
+++ b/src/arch/x86/regs/int.hh
diff --git a/src/arch/x86/miscregs.hh b/src/arch/x86/regs/misc.hh
index 6a71424ff..74c6bd133 100644
--- a/src/arch/x86/miscregs.hh
+++ b/src/arch/x86/regs/misc.hh
@@ -40,7 +40,7 @@
 #ifndef __ARCH_X86_MISCREGS_HH__
 #define __ARCH_X86_MISCREGS_HH__
 
-#include "arch/x86/segmentregs.hh"
+#include "arch/x86/regs/segment.hh"
 #include "arch/x86/x86_traits.hh"
 #include "base/bitunion.hh"
 
diff --git a/src/arch/x86/segmentregs.hh b/src/arch/x86/regs/segment.hh
index 737934152..737934152 100644
--- a/src/arch/x86/segmentregs.hh
+++ b/src/arch/x86/regs/segment.hh
diff --git a/src/arch/x86/system.cc b/src/arch/x86/system.cc
index 46d17cdb3..f12d6e424 100644
--- a/src/arch/x86/system.cc
+++ b/src/arch/x86/system.cc
@@ -39,7 +39,7 @@
 
 #include "arch/x86/bios/smbios.hh"
 #include "arch/x86/bios/intelmp.hh"
-#include "arch/x86/miscregs.hh"
+#include "arch/x86/regs/misc.hh"
 #include "arch/x86/system.hh"
 #include "arch/vtophys.hh"
 #include "base/intmath.hh"
diff --git a/src/arch/x86/tlb.cc b/src/arch/x86/tlb.cc
index 78efd5b69..71e0b3adb 100644
--- a/src/arch/x86/tlb.cc
+++ b/src/arch/x86/tlb.cc
@@ -43,8 +43,8 @@
 
 #include "arch/x86/faults.hh"
 #include "arch/x86/insts/microldstop.hh"
-#include "arch/x86/miscregs.hh"
 #include "arch/x86/pagetable.hh"
+#include "arch/x86/regs/misc.hh"
 #include "arch/x86/tlb.hh"
 #include "arch/x86/x86_traits.hh"
 #include "base/bitfield.hh"
diff --git a/src/arch/x86/tlb.hh b/src/arch/x86/tlb.hh
index 8a6b7a00a..09a26f3e7 100644
--- a/src/arch/x86/tlb.hh
+++ b/src/arch/x86/tlb.hh
@@ -45,7 +45,7 @@
 #include <string>
 
 #include "arch/x86/pagetable.hh"
-#include "arch/x86/segmentregs.hh"
+#include "arch/x86/regs/segment.hh"
 #include "config/full_system.hh"
 #include "mem/mem_object.hh"
 #include "mem/request.hh"
diff --git a/src/arch/x86/utility.cc b/src/arch/x86/utility.cc
index 4a3263f4c..50574bcde 100644
--- a/src/arch/x86/utility.cc
+++ b/src/arch/x86/utility.cc
@@ -42,9 +42,9 @@
 #if FULL_SYSTEM
 #include "arch/x86/interrupts.hh"
 #endif
-#include "arch/x86/intregs.hh"
-#include "arch/x86/miscregs.hh"
-#include "arch/x86/segmentregs.hh"
+#include "arch/x86/regs/int.hh"
+#include "arch/x86/regs/misc.hh"
+#include "arch/x86/regs/segment.hh"
 #include "arch/x86/utility.hh"
 #include "arch/x86/x86_traits.hh"
 #include "cpu/base.hh"
diff --git a/src/arch/x86/utility.hh b/src/arch/x86/utility.hh
index 4c987faee..db03da7a0 100644
--- a/src/arch/x86/utility.hh
+++ b/src/arch/x86/utility.hh
@@ -40,7 +40,7 @@
 #ifndef __ARCH_X86_UTILITY_HH__
 #define __ARCH_X86_UTILITY_HH__
 
-#include "arch/x86/miscregs.hh"
+#include "arch/x86/regs/misc.hh"
 #include "arch/x86/types.hh"
 #include "base/hashmap.hh"
 #include "base/misc.hh"