types: Move stuff for global types into src/base/types.hh

--HG--
rename : src/sim/host.hh => src/base/types.hh

diff --git a/src/arch/alpha/isa_traits.hh b/src/arch/alpha/isa_traits.hh
index ab3af0a1d7fda870959175713a8bfa98a2ad6e9b..aae8271ce8de50eaf2b8f6e374d6e6e455baac1e 100644 (file)
--- a/src/arch/alpha/isa_traits.hh
+++ b/src/arch/alpha/isa_traits.hh
@@ -38,7 +38,7 @@ namespace LittleEndianGuest {}
 #include "arch/alpha/max_inst_regs.hh"
 #include "arch/alpha/types.hh"
 #include "config/full_system.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class StaticInstPtr;
 

diff --git a/src/arch/alpha/miscregfile.hh b/src/arch/alpha/miscregfile.hh
index b194e00bb2a3d42a5d1e9a0c3aedd83bae0e1521..1a215b8e49f35dbe83379218f400f0e8883aaf7c 100644 (file)
--- a/src/arch/alpha/miscregfile.hh
+++ b/src/arch/alpha/miscregfile.hh
@@ -36,7 +36,7 @@
 
 #include "arch/alpha/ipr.hh"
 #include "arch/alpha/types.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/serialize.hh"
 
 class Checkpoint;

diff --git a/src/arch/alpha/predecoder.hh b/src/arch/alpha/predecoder.hh
index 5502342e17e20a028d35e3a91ae6d9f85c5f2433..d18bb24029159d4be9f291e39be080e27e6cc939 100644 (file)
--- a/src/arch/alpha/predecoder.hh
+++ b/src/arch/alpha/predecoder.hh
@@ -34,7 +34,7 @@
 #include "arch/alpha/types.hh"
 #include "base/misc.hh"
 #include "config/full_system.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 

diff --git a/src/arch/alpha/types.hh b/src/arch/alpha/types.hh
index 7905114b8b2f6c96d6ea95e93f7f2b7bf5ba3faf..d670784c433b862e10caa44a04eecf6de5963360 100644 (file)
--- a/src/arch/alpha/types.hh
+++ b/src/arch/alpha/types.hh
@@ -32,7 +32,7 @@
 #ifndef __ARCH_ALPHA_TYPES_HH__
 #define __ARCH_ALPHA_TYPES_HH__
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace AlphaISA {
 

diff --git a/src/arch/arm/isa_traits.hh b/src/arch/arm/isa_traits.hh
index cf07699ce2e80e7eddf48b74656ea61142f5e451..6f5e17497bbd1a08393f6048111b48f9fcc8b7d3 100644 (file)
--- a/src/arch/arm/isa_traits.hh
+++ b/src/arch/arm/isa_traits.hh
@@ -34,7 +34,7 @@
 #define __ARCH_ARM_ISA_TRAITS_HH__
 
 #include "arch/arm/types.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace LittleEndianGuest {};
 

diff --git a/src/arch/arm/predecoder.hh b/src/arch/arm/predecoder.hh
index 86d344b057d49e91f01cfae5c7d2909bbd0f8c6a..2c0b773a061ba18d57257dab4fc04dec9046ffa4 100644 (file)
--- a/src/arch/arm/predecoder.hh
+++ b/src/arch/arm/predecoder.hh
@@ -35,7 +35,7 @@
 
 #include "arch/arm/types.hh"
 #include "base/misc.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 

diff --git a/src/arch/arm/types.hh b/src/arch/arm/types.hh
index 0a8d5d696637b7d5044c0131797796ff162633c6..a2f664f1b1a5c59d7afe023968e553ff7da37517 100644 (file)
--- a/src/arch/arm/types.hh
+++ b/src/arch/arm/types.hh
@@ -31,7 +31,7 @@
 #ifndef __ARCH_ARM_TYPES_HH__
 #define __ARCH_ARM_TYPES_HH__
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace ArmISA
 {

diff --git a/src/arch/arm/utility.hh b/src/arch/arm/utility.hh
index fedf1fa05566da025d685a0d038e63e2eee68677..e26a00706237a9d64aca7d1b7b220475042af77d 100644 (file)
--- a/src/arch/arm/utility.hh
+++ b/src/arch/arm/utility.hh
@@ -37,7 +37,7 @@
 #include "base/misc.hh"
 #include "config/full_system.hh"
 #include "cpu/thread_context.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 

diff --git a/src/arch/mips/dsp.hh b/src/arch/mips/dsp.hh
index fde4b332af3cf4cf01703f5054830a265b29f8f4..dbada893aa40969b755141a94b27a1b09a4ddf27 100755 (executable)
--- a/src/arch/mips/dsp.hh
+++ b/src/arch/mips/dsp.hh
@@ -35,7 +35,7 @@
 #include "arch/mips/isa_traits.hh"
 #include "base/misc.hh"
 #include "config/full_system.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 

diff --git a/src/arch/mips/isa_traits.hh b/src/arch/mips/isa_traits.hh
index fb46890c1c39101c8995bbb52e38ac25c08ee074..b091adb5d2c81800138cf0f056a394318ea2ec58 100644 (file)
--- a/src/arch/mips/isa_traits.hh
+++ b/src/arch/mips/isa_traits.hh
@@ -37,7 +37,7 @@
 #include "arch/mips/types.hh"
 #include "arch/mips/mips_core_specific.hh"
 #include "config/full_system.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace LittleEndianGuest {};
 

diff --git a/src/arch/mips/predecoder.hh b/src/arch/mips/predecoder.hh
index a33082718a42d4ecfc50d05236b2e400d6434515..01e2ee7687176a4d764d81f12c7163364b9c6dce 100644 (file)
--- a/src/arch/mips/predecoder.hh
+++ b/src/arch/mips/predecoder.hh
@@ -34,7 +34,7 @@
 
 #include "arch/mips/types.hh"
 #include "base/misc.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 

diff --git a/src/arch/mips/types.hh b/src/arch/mips/types.hh
index b459d9e146d03cbc4c605c6c9cd46aa97fd4b409..4e0684e780d33f1ee22f3ad579d7402f04ce92b2 100644 (file)
--- a/src/arch/mips/types.hh
+++ b/src/arch/mips/types.hh
@@ -31,7 +31,7 @@
 #ifndef __ARCH_MIPS_TYPES_HH__
 #define __ARCH_MIPS_TYPES_HH__
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace MipsISA
 {

diff --git a/src/arch/mips/utility.hh b/src/arch/mips/utility.hh
index 12ce3af9ef7cd4b5e0c0c03a88367f5728beb354..95b7c875e3a8669dc572d22dc51980427bac5ff1 100644 (file)
--- a/src/arch/mips/utility.hh
+++ b/src/arch/mips/utility.hh
@@ -40,7 +40,7 @@
 #include "config/full_system.hh"
 //XXX This is needed for size_t. We should use something other than size_t
 //#include "kern/linux/linux.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 #include "cpu/thread_context.hh"
 

diff --git a/src/arch/sparc/isa_traits.hh b/src/arch/sparc/isa_traits.hh
index 9833057a26451ee56614e82b2995109c2ba08957..1c783a9b9a173f37f5dbd7b1b11ade0f6828a168 100644 (file)
--- a/src/arch/sparc/isa_traits.hh
+++ b/src/arch/sparc/isa_traits.hh
@@ -36,7 +36,7 @@
 #include "arch/sparc/max_inst_regs.hh"
 #include "arch/sparc/sparc_traits.hh"
 #include "config/full_system.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class StaticInstPtr;
 

diff --git a/src/arch/sparc/predecoder.hh b/src/arch/sparc/predecoder.hh
index 13ce5c1b6b5bc46842e30c210c0410e8c6f6b8b5..c7503b282ec3208b42c7c50ef89cd4dde45d08dd 100644 (file)
--- a/src/arch/sparc/predecoder.hh
+++ b/src/arch/sparc/predecoder.hh
@@ -34,7 +34,7 @@
 #include "arch/sparc/types.hh"
 #include "base/misc.hh"
 #include "cpu/thread_context.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 

diff --git a/src/arch/sparc/regfile.hh b/src/arch/sparc/regfile.hh
index 505d7c8d75fd03b5e1b96b86772c7f4706053d83..f732c962562e9130cf8bdafbe96715eae4e984df 100644 (file)
--- a/src/arch/sparc/regfile.hh
+++ b/src/arch/sparc/regfile.hh
@@ -37,7 +37,7 @@
 #include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/miscregfile.hh"
 #include "arch/sparc/types.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 #include <string>
 

diff --git a/src/arch/x86/bios/acpi.hh b/src/arch/x86/bios/acpi.hh
index 7bca177907f8a500f60dc4fb21db4708d363d0e4..bcc4e196232e33501e9b4b8f9c3a511199bc8bf7 100644 (file)
--- a/src/arch/x86/bios/acpi.hh
+++ b/src/arch/x86/bios/acpi.hh
@@ -58,7 +58,7 @@
 #ifndef __ARCH_X86_BIOS_ACPI_HH__
 #define __ARCH_X86_BIOS_ACPI_HH__
 
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 
 #include <vector>

diff --git a/src/arch/x86/bios/e820.hh b/src/arch/x86/bios/e820.hh
index da738343bdf2184801459a4f4c9aebd90612491f..0cff6cc1640a34a8e738b74baa182b38adab5164 100644 (file)
--- a/src/arch/x86/bios/e820.hh
+++ b/src/arch/x86/bios/e820.hh
@@ -60,7 +60,7 @@
 
 #include "params/X86E820Entry.hh"
 #include "params/X86E820Table.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 
 #include <vector>

diff --git a/src/arch/x86/bios/intelmp.cc b/src/arch/x86/bios/intelmp.cc
index 2332e7a5c0cf20e4d8118d1130961a6bd521edf3..e526f9658f58f0a77b533689296de3a74c33ce60 100644 (file)
--- a/src/arch/x86/bios/intelmp.cc
+++ b/src/arch/x86/bios/intelmp.cc
@@ -60,7 +60,7 @@
 #include "base/misc.hh"
 #include "mem/port.hh"
 #include "sim/byteswap.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 // Config entry types
 #include "params/X86IntelMPBaseConfigEntry.hh"

diff --git a/src/arch/x86/bios/smbios.cc b/src/arch/x86/bios/smbios.cc
index 95ade1e4d8b18b0d7e30083ed7e87de8a52cf30e..1e49a875aaa648ca05fa6cf52b70411074c27bf5 100644 (file)
--- a/src/arch/x86/bios/smbios.cc
+++ b/src/arch/x86/bios/smbios.cc
@@ -92,7 +92,7 @@
 #include "params/X86SMBiosSMBiosStructure.hh"
 #include "params/X86SMBiosSMBiosTable.hh"
 #include "sim/byteswap.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 using namespace std;
 

diff --git a/src/arch/x86/bios/smbios.hh b/src/arch/x86/bios/smbios.hh
index 1c50d0b48d1f1de8ac3651e0e07679cedc3b05e3..688b0a6c5ddd4e3308be8b3bcd6f73d35b90a9eb 100644 (file)
--- a/src/arch/x86/bios/smbios.hh
+++ b/src/arch/x86/bios/smbios.hh
@@ -93,7 +93,7 @@
 
 #include "enums/Characteristic.hh"
 #include "enums/ExtCharacteristic.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 
 class FunctionalPort;

diff --git a/src/arch/x86/intmessage.hh b/src/arch/x86/intmessage.hh
index 467085da2b81ef14d940c37462e979f135e23425..48f6c671b772076350665e9f29824769d0e4609d 100644 (file)
--- a/src/arch/x86/intmessage.hh
+++ b/src/arch/x86/intmessage.hh
@@ -36,7 +36,7 @@
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "mem/request.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace X86ISA
 {

diff --git a/src/arch/x86/isa_traits.hh b/src/arch/x86/isa_traits.hh
index 09241c3107a2713f334ebb92ba4426a9ac97913f..2b549bb4a3a252d4be4a3143697e924b49055b75 100644 (file)
--- a/src/arch/x86/isa_traits.hh
+++ b/src/arch/x86/isa_traits.hh
@@ -62,7 +62,7 @@
 #include "arch/x86/max_inst_regs.hh"
 #include "arch/x86/types.hh"
 #include "arch/x86/x86_traits.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class StaticInstPtr;
 

diff --git a/src/arch/x86/miscregfile.hh b/src/arch/x86/miscregfile.hh
index babc65b440b88703adadbb962b1b648adc938fcf..fad70bf78a0e251135f7bd60af170c1d815346b9 100644 (file)
--- a/src/arch/x86/miscregfile.hh
+++ b/src/arch/x86/miscregfile.hh
@@ -91,7 +91,7 @@
 #include "arch/x86/faults.hh"
 #include "arch/x86/miscregs.hh"
 #include "arch/x86/types.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 #include <string>
 

diff --git a/src/arch/x86/pagetable.hh b/src/arch/x86/pagetable.hh
index 1a7a945e4fc61b027e4069069a3c9ec60a55782c..2c359c2cf4643f74953997e7f15fe491dc9263b2 100644 (file)
--- a/src/arch/x86/pagetable.hh
+++ b/src/arch/x86/pagetable.hh
@@ -61,7 +61,7 @@
 #include <iostream>
 #include <string>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/bitunion.hh"
 #include "base/misc.hh"
 

diff --git a/src/arch/x86/pagetable_walker.hh b/src/arch/x86/pagetable_walker.hh
index 0f9d24923f943d6a0d3d1c53f825600ce15b1156..613832cb93ee012dc49426ff493d67c2a349d219 100644 (file)
--- a/src/arch/x86/pagetable_walker.hh
+++ b/src/arch/x86/pagetable_walker.hh
@@ -65,7 +65,7 @@
 #include "mem/mem_object.hh"
 #include "mem/packet.hh"
 #include "params/X86PagetableWalker.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 

diff --git a/src/arch/x86/predecoder.cc b/src/arch/x86/predecoder.cc
index 5bac8e7114a64cb13c9b42e161eebb3543e934f6..0ae0fd3281cffad6158bd2e12db104c54ddb4028 100644 (file)
--- a/src/arch/x86/predecoder.cc
+++ b/src/arch/x86/predecoder.cc
@@ -60,7 +60,7 @@
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace X86ISA
 {

diff --git a/src/arch/x86/predecoder.hh b/src/arch/x86/predecoder.hh
index 4893f1de9ceda028efe6ca2bc267bf03756a11be..baef64d437d7d1dc39b6e90b546536bb871309cf 100644 (file)
--- a/src/arch/x86/predecoder.hh
+++ b/src/arch/x86/predecoder.hh
@@ -65,7 +65,7 @@
 #include "base/bitfield.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 

diff --git a/src/arch/x86/regfile.hh b/src/arch/x86/regfile.hh
index 8938ab0bc14117103f7b9af3a9cde80703f5cbfc..07561fe8a1b23537bf994c94bd8308a4932af086 100644 (file)
--- a/src/arch/x86/regfile.hh
+++ b/src/arch/x86/regfile.hh
@@ -63,7 +63,7 @@
 #include "arch/x86/isa_traits.hh"
 #include "arch/x86/miscregfile.hh"
 #include "arch/x86/types.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 #include <string>
 

diff --git a/src/arch/x86/utility.hh b/src/arch/x86/utility.hh
index 6f0812a6ad2073ce9517770c4722147e45213ffa..c34411a2f3f1dcad19dc73b84170e42c3b8bda02 100644 (file)
--- a/src/arch/x86/utility.hh
+++ b/src/arch/x86/utility.hh
@@ -63,7 +63,7 @@
 #include "base/misc.hh"
 #include "config/full_system.hh"
 #include "cpu/thread_context.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 

diff --git a/src/arch/x86/vtophys.hh b/src/arch/x86/vtophys.hh
index be5e2700fbcc2235d158e625b6d7300e5655226e..b36c24a1aa3cc9c375d2cced3dde3fefe4b512b2 100644 (file)
--- a/src/arch/x86/vtophys.hh
+++ b/src/arch/x86/vtophys.hh
@@ -60,7 +60,7 @@
 
 #include "arch/x86/isa_traits.hh"
 #include "arch/x86/pagetable.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 class FunctionalPort;

diff --git a/src/arch/x86/x86_traits.hh b/src/arch/x86/x86_traits.hh
index 0347a70998b0f0926bb5eec02c4c0ae161f140ef..381695c4064436aeb512d1ffb7253c55eea1388c 100644 (file)
--- a/src/arch/x86/x86_traits.hh
+++ b/src/arch/x86/x86_traits.hh
@@ -60,7 +60,7 @@
 
 #include <assert.h>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace X86ISA
 {

diff --git a/src/base/cp_annotate.hh b/src/base/cp_annotate.hh
index 13ced82de0ad0e1dfae71417b4ef2de6b63be76e..811f95f54ea2584cebf77046cbb654475a4b5226 100644 (file)
--- a/src/base/cp_annotate.hh
+++ b/src/base/cp_annotate.hh
@@ -33,7 +33,7 @@
 
 #include "base/loader/symtab.hh"
 #include "config/cp_annotate.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/serialize.hh"
 #include "sim/startup.hh"
 #include "sim/system.hh"

diff --git a/src/base/crc.cc b/src/base/crc.cc
index ce837a4082915bbfe52e0d6efe45b23c83e96f94..eb1f4b641e28f810e6b63b4162e8b95bb6a8379e 100644 (file)
--- a/src/base/crc.cc
+++ b/src/base/crc.cc
@@ -33,7 +33,7 @@
 
 #include <string>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/crc.hh"
 
 #define ETHER_CRC_POLY_LE 0xedb88320

diff --git a/src/base/crc.hh b/src/base/crc.hh
index 16dce79aac8c49658dee8c3a791950413743b63c..212be4f8ab590baf1fc132d688c0890f1034a2ad 100644 (file)
--- a/src/base/crc.hh
+++ b/src/base/crc.hh
@@ -31,7 +31,7 @@
 #ifndef __BASE_CRC_HH__
 #define __BASE_CRC_HH__
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 uint32_t crc32be(const uint8_t *buf, size_t len);
 uint32_t crc32le(const uint8_t *buf, size_t len);

diff --git a/src/base/fast_alloc.hh b/src/base/fast_alloc.hh
index c6490174ed63b3cbf80e7b4bc028b692258a1bb7..aa8fff1307b685753112acc97dc0e5bba90ed307 100644 (file)
--- a/src/base/fast_alloc.hh
+++ b/src/base/fast_alloc.hh
@@ -75,7 +75,7 @@ class FastAlloc
 #else
 
 #if FAST_ALLOC_DEBUG
-#include "sim/host.hh"   // for Tick
+#include "base/types.hh"
 #endif
 
 class FastAlloc

diff --git a/src/base/hashmap.hh b/src/base/hashmap.hh
index ff2aa151fd6eeed7e39d206c96970fd5e21cba28..e8f525e4d48f145da97ebccd6642b5a4eeb81818 100644 (file)
--- a/src/base/hashmap.hh
+++ b/src/base/hashmap.hh
@@ -39,7 +39,7 @@
 
 #include <string>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 #if defined(__GNUC__) && __GNUC__ >= 3
     #define __hash_namespace __gnu_cxx

diff --git a/src/base/hostinfo.cc b/src/base/hostinfo.cc
index ef64feeb4aa84c17e2b04dd7f8639bd12442cae9..ffc2f93ffde05f361c4634a7dafaf3b8e9470b15 100644 (file)
--- a/src/base/hostinfo.cc
+++ b/src/base/hostinfo.cc
@@ -39,7 +39,7 @@
 #include <string>
 
 #include "base/misc.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 using namespace std;
 

diff --git a/src/base/hostinfo.hh b/src/base/hostinfo.hh
index 70cd19203c28e42b38e6c1af01062d03f075d16a..ac7d40f13eddaa10ff9e69551d734bdb98bf3ff3 100644 (file)
--- a/src/base/hostinfo.hh
+++ b/src/base/hostinfo.hh
@@ -33,7 +33,7 @@
 
 #include <string>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 std::string &hostname();
 

diff --git a/src/base/inet.cc b/src/base/inet.cc
index 8c3240fa6fdf00456e93d96e61c1240a5de23d8c..84379b135496b05bfd22903fe746bb0e8e71891b 100644 (file)
--- a/src/base/inet.cc
+++ b/src/base/inet.cc
@@ -32,7 +32,7 @@
 #include <string>
 
 #include "base/cprintf.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/inet.hh"
 
 using namespace std;

diff --git a/src/base/inet.hh b/src/base/inet.hh
index 59b05291da0aef4212e33572e01b4538929cb293..61d432036e88563e01786813ea1fbbf5d565bbdb 100644 (file)
--- a/src/base/inet.hh
+++ b/src/base/inet.hh
@@ -39,7 +39,7 @@
 
 #include "base/range.hh"
 #include "dev/etherpkt.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 #include "dnet/os.h"
 #include "dnet/eth.h"

diff --git a/src/base/intmath.hh b/src/base/intmath.hh
index c536fda519b843f13faf031d762dc76e52a1ccce..139f6bf158fc0c6da214898c75da32094ac2bfde 100644 (file)
--- a/src/base/intmath.hh
+++ b/src/base/intmath.hh
@@ -33,7 +33,7 @@
 
 #include <assert.h>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 // Returns the prime number one less than n.
 int prevPrime(int n);

diff --git a/src/base/loader/hex_file.hh b/src/base/loader/hex_file.hh
index 40483e6848677599038be52c333147a209536490..87a7eb0f32498928d93f8582ba39fc2648b97ac5 100755 (executable)
--- a/src/base/loader/hex_file.hh
+++ b/src/base/loader/hex_file.hh
@@ -35,7 +35,7 @@
 #include <limits>
 #include <string>
 
-#include "sim/host.hh"  // for Addr
+#include "base/types.hh"
 
 class Port;
 

diff --git a/src/base/loader/object_file.hh b/src/base/loader/object_file.hh
index d363cde84f2a7b3fc8b0fda25c9af559f33b2bdc..73df5caf6da1d7778ead33674ebc213946ff2ac7 100644 (file)
--- a/src/base/loader/object_file.hh
+++ b/src/base/loader/object_file.hh
@@ -35,7 +35,7 @@
 #include <limits>
 #include <string>
 
-#include "sim/host.hh"  // for Addr
+#include "base/types.hh"
 
 class Port;
 class SymbolTable;

diff --git a/src/base/loader/symtab.cc b/src/base/loader/symtab.cc
index 3e73eb7a38d048f70f7bd7709641f5274b09b975..d137477f4fd96a0def17da3170e430265bc03680 100644 (file)
--- a/src/base/loader/symtab.cc
+++ b/src/base/loader/symtab.cc
@@ -36,7 +36,7 @@
 #include "base/loader/symtab.hh"
 #include "base/misc.hh"
 #include "base/str.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/serialize.hh"
 
 using namespace std;

diff --git a/src/base/loader/symtab.hh b/src/base/loader/symtab.hh
index cc1dc368f4036b5e5ee6196381358a0b9b9643b7..2a2fd068ed610211776bd1aea99585c9c4584a96 100644 (file)
--- a/src/base/loader/symtab.hh
+++ b/src/base/loader/symtab.hh
@@ -36,7 +36,7 @@
 #include <map>
 #include <string>
 
-#include "sim/host.hh"  // for Addr
+#include "base/types.hh"
 
 class Checkpoint;
 class SymbolTable

diff --git a/src/base/misc.cc b/src/base/misc.cc
index 035282baf46895a416990af077ced43b60996d60..55c324aaa9a42f0f197f0baba0a0aaf3c25f8e1d 100644 (file)
--- a/src/base/misc.cc
+++ b/src/base/misc.cc
@@ -39,7 +39,7 @@
 #include "base/output.hh"
 #include "base/trace.hh"
 #include "base/varargs.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/core.hh"
 
 using namespace std;

diff --git a/src/base/pollevent.cc b/src/base/pollevent.cc
index 331b5eac6b1d3f019808f8c90b0e58be19dd3e8d..0f237566a522fb48ff56049c552022e45e9f193f 100644 (file)
--- a/src/base/pollevent.cc
+++ b/src/base/pollevent.cc
@@ -39,7 +39,7 @@
 #include <unistd.h>
 
 #include "sim/async.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/misc.hh"
 #include "base/pollevent.hh"
 #include "sim/core.hh"

diff --git a/src/base/random.hh b/src/base/random.hh
index 401ba086ff16d56fca9ed2fcb00e18f0e3517180..b74a7c4a239542399eb065061df6a25d2e42fd83 100644 (file)
--- a/src/base/random.hh
+++ b/src/base/random.hh
@@ -36,7 +36,7 @@
 #include <string>
 
 #include "base/range.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class Checkpoint;
 

diff --git a/src/base/socket.cc b/src/base/socket.cc
index bcc5236b097ea7eb426c26c8f93945a74ef47a4c..4ad8f5c93b23ca8165a908485034c08e3b43a654 100644 (file)
--- a/src/base/socket.cc
+++ b/src/base/socket.cc
@@ -37,7 +37,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/misc.hh"
 #include "base/socket.hh"
 

diff --git a/src/base/statistics.hh b/src/base/statistics.hh
index 45cd5186c7d927846786cf43705785ec564c2595..243d56c3a1ec0ca0b06a009cfa3a4dabac0cdd60 100644 (file)
--- a/src/base/statistics.hh
+++ b/src/base/statistics.hh
@@ -67,7 +67,7 @@
 #include "base/stats/info.hh"
 #include "base/stats/types.hh"
 #include "base/stats/visit.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class Callback;
 

diff --git a/src/base/stats/events.cc b/src/base/stats/events.cc
index dcf52e6d8eda0f9fd1898754b83398ed658e01ba..29117b1e2063779e863ebb7973ae3a3f2918a2ea 100644 (file)
--- a/src/base/stats/events.cc
+++ b/src/base/stats/events.cc
@@ -32,7 +32,7 @@
 
 #include "base/stats/events.hh"
 #include "base/stats/output.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 using namespace std;
 

diff --git a/src/base/stats/mysql.cc b/src/base/stats/mysql.cc
index d14904fb0ca25dc6f957a34dfa4726b6e73e3fe1..91bea45405f9a1369cc73f1383f7e2f76e624f2d 100644 (file)
--- a/src/base/stats/mysql.cc
+++ b/src/base/stats/mysql.cc
@@ -43,7 +43,7 @@
 #include "base/stats/types.hh"
 #include "base/str.hh"
 #include "base/userinfo.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 using namespace std;
 

diff --git a/src/base/stats/mysql_run.hh b/src/base/stats/mysql_run.hh
index 7c606370e5b95c417e2b635344190f246d818918..7207cd841f3a2946a5ead72ed53bfcf1897a3808 100644 (file)
--- a/src/base/stats/mysql_run.hh
+++ b/src/base/stats/mysql_run.hh
@@ -34,7 +34,7 @@
 #include <string>
 
 #include "base/mysql.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace Stats {
 

diff --git a/src/base/stats/output.cc b/src/base/stats/output.cc
index 31aa21c458bdce5a97de5a3c429de0c96448d4c1..f3a549b44167f3623f5044174caaa2e5916f0765 100644 (file)
--- a/src/base/stats/output.cc
+++ b/src/base/stats/output.cc
@@ -33,7 +33,7 @@
 #include "base/statistics.hh"
 #include "base/stats/output.hh"
 #include "sim/eventq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 using namespace std;
 

diff --git a/src/base/stats/types.hh b/src/base/stats/types.hh
index e561f94ad5ddf23ed51a1410a133d20ed2819778..87cf91653a098401cfff89b23acbf9688d2b10f2 100644 (file)
--- a/src/base/stats/types.hh
+++ b/src/base/stats/types.hh
@@ -34,7 +34,7 @@
 #include <limits>
 #include <vector>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace Stats {
 

diff --git a/src/base/stats/visit.hh b/src/base/stats/visit.hh
index 89dd57912c22c7e25433340b6d07c3107eebc64c..c9fab19a3e9da35c1a5be51d4bc4668c0dd826c6 100644 (file)
--- a/src/base/stats/visit.hh
+++ b/src/base/stats/visit.hh
@@ -34,7 +34,7 @@
 #include <string>
 
 #include "base/time.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace Stats {
 

diff --git a/src/base/trace.hh b/src/base/trace.hh
index fa24e9c4875e7cc06aab0d6e3108ef0a8655e2a2..6f8c196b09671d6a1185cd765ecb89a01a000942 100644 (file)
--- a/src/base/trace.hh
+++ b/src/base/trace.hh
@@ -38,7 +38,7 @@
 #include "base/cprintf.hh"
 #include "base/match.hh"
 #include "base/traceflags.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/core.hh"
 
 namespace Trace {

diff --git a/src/base/types.hh b/src/base/types.hh
new file mode 100644 (file)
index 0000000..6d8d309
--- /dev/null
+++ b/src/base/types.hh
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2003-2005 The Regents of The University of Michigan
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Nathan Binkert
+ */
+
+/**
+ * @file
+ * Defines global host-dependent types:
+ * Counter, Tick, and (indirectly) {int,uint}{8,16,32,64}_t.
+ */
+
+#ifndef __BASE_TYPES_HH__
+#define __BASE_TYPES_HH__
+
+#include <inttypes.h>
+
+/** uint64_t constant */
+#define ULL(N)          ((uint64_t)N##ULL)
+/** int64_t constant */
+#define LL(N)           ((int64_t)N##LL)
+
+/** Statistics counter type.  Not much excuse for not using a 64-bit
+ * integer here, but if you're desperate and only run short
+ * simulations you could make this 32 bits.
+ */
+typedef int64_t Counter;
+
+/**
+ * Clock cycle count type.
+ * @note using an unsigned breaks the cache.
+ */
+typedef int64_t Tick;
+
+const Tick MaxTick = LL(0x7fffffffffffffff);
+
+/**
+ * Address type
+ * This will probably be moved somewhere else in the near future.
+ * This should be at least as big as the biggest address width in use
+ * in the system, which will probably be 64 bits.
+ */
+typedef uint64_t Addr;
+
+const Addr MaxAddr = (Addr)-1;
+
+#endif // __BASE_TYPES_HH__

diff --git a/src/cpu/exetrace.hh b/src/cpu/exetrace.hh
index e49a2bb59ce3c3269c7e8b1280c1d5b0b94b0c01..a1bbe3735162a5bdf473c6b9689ed59297ef67c0 100644 (file)
--- a/src/cpu/exetrace.hh
+++ b/src/cpu/exetrace.hh
@@ -34,7 +34,7 @@
 
 #include "base/trace.hh"
 #include "cpu/static_inst.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/insttracer.hh"
 #include "params/ExeTracer.hh"
 

diff --git a/src/cpu/inorder/comm.hh b/src/cpu/inorder/comm.hh
index 18bb24169776cf324b3de266917889697ea9fba8..1a7fc9050d06490864903b8aefb3489e55d2b674 100644 (file)
--- a/src/cpu/inorder/comm.hh
+++ b/src/cpu/inorder/comm.hh
@@ -39,7 +39,7 @@
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inst_seq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 /** Struct that defines the information passed from in between stages */
 /** This information mainly goes forward through the pipeline. */

diff --git a/src/cpu/inorder/inorder_trace.hh b/src/cpu/inorder/inorder_trace.hh
index 4338b438c7d503609e91c44ef22cfb98fc4a99db..eb12873700474f1b2f17897d37fe42b89b8dbcdc 100644 (file)
--- a/src/cpu/inorder/inorder_trace.hh
+++ b/src/cpu/inorder/inorder_trace.hh
@@ -34,7 +34,7 @@
 
 #include "base/trace.hh"
 #include "cpu/static_inst.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/insttracer.hh"
 #include "params/InOrderTrace.hh"
 #include "cpu/exetrace.hh"

diff --git a/src/cpu/inteltrace.hh b/src/cpu/inteltrace.hh
index e34658b584cf9c0219f776c8fc1dc5160e3fc36e..56fafe93aa7630ceec0035d364bde255139a1560 100644 (file)
--- a/src/cpu/inteltrace.hh
+++ b/src/cpu/inteltrace.hh
@@ -35,7 +35,7 @@
 #include "base/trace.hh"
 #include "cpu/static_inst.hh"
 #include "params/IntelTrace.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/insttracer.hh"
 
 class ThreadContext;

diff --git a/src/cpu/legiontrace.hh b/src/cpu/legiontrace.hh
index 9962063e4b606d20a9509cc912e1b30a0ce0719b..19a996ed37147fb364e524c09bf9019a4ec5d8b8 100644 (file)
--- a/src/cpu/legiontrace.hh
+++ b/src/cpu/legiontrace.hh
@@ -35,7 +35,7 @@
 #include "base/trace.hh"
 #include "cpu/static_inst.hh"
 #include "params/LegionTrace.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/insttracer.hh"
 
 class ThreadContext;

diff --git a/src/cpu/nativetrace.hh b/src/cpu/nativetrace.hh
index 9e912d92f42aa37764d1fb718c43331ed1a9f508..12d96e0aef5b14aa0832a2ea4d874b7063b37766 100644 (file)
--- a/src/cpu/nativetrace.hh
+++ b/src/cpu/nativetrace.hh
@@ -34,7 +34,7 @@
 
 #include "base/trace.hh"
 #include "cpu/static_inst.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/insttracer.hh"
 #include "arch/x86/intregs.hh"
 #include "arch/x86/floatregs.hh"

diff --git a/src/cpu/o3/2bit_local_pred.hh b/src/cpu/o3/2bit_local_pred.hh
index 954b86b4c772b9d92f61c772bd72616955c4e874..7669c6b974152d3930aafde13004d694f7c20611 100644 (file)
--- a/src/cpu/o3/2bit_local_pred.hh
+++ b/src/cpu/o3/2bit_local_pred.hh
@@ -32,7 +32,7 @@
 #define __CPU_O3_2BIT_LOCAL_PRED_HH__
 
 #include "cpu/o3/sat_counter.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 #include <vector>
 

diff --git a/src/cpu/o3/bpred_unit.hh b/src/cpu/o3/bpred_unit.hh
index a11582ca7832b75b8134713ef3704afaa8445b26..15d34316ee4de268ecb670f07382bb760b384282 100644 (file)
--- a/src/cpu/o3/bpred_unit.hh
+++ b/src/cpu/o3/bpred_unit.hh
@@ -39,7 +39,7 @@
 #include "cpu/o3/ras.hh"
 #include "cpu/o3/tournament_pred.hh"
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 #include <list>
 

diff --git a/src/cpu/o3/btb.hh b/src/cpu/o3/btb.hh
index 3c4899e899b17b93a275a664711f0759b5d4349e..38ecabc462a22f51f1661012c86030985442097d 100644 (file)
--- a/src/cpu/o3/btb.hh
+++ b/src/cpu/o3/btb.hh
@@ -32,7 +32,7 @@
 #define __CPU_O3_BTB_HH__
 
 #include "base/misc.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class DefaultBTB
 {

diff --git a/src/cpu/o3/comm.hh b/src/cpu/o3/comm.hh
index fb772060b92dfee4f882643796c4a068707d7b7a..a486f340d460a5d3cb06d647bbd14524067dedf7 100644 (file)
--- a/src/cpu/o3/comm.hh
+++ b/src/cpu/o3/comm.hh
@@ -35,7 +35,7 @@
 
 #include "sim/faults.hh"
 #include "cpu/inst_seq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 // Typedef for physical register index type. Although the Impl would be the
 // most likely location for this, there are a few classes that need this

diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh
index 279d3e56a1982d80b85065763c18db2e61718c19..96a4aebef2a23e0b688a04f01d253843c50390f3 100644 (file)
--- a/src/cpu/o3/fetch_impl.hh
+++ b/src/cpu/o3/fetch_impl.hh
@@ -42,7 +42,7 @@
 #include "mem/packet.hh"
 #include "mem/request.hh"
 #include "sim/byteswap.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/core.hh"
 
 #if FULL_SYSTEM

diff --git a/src/cpu/o3/inst_queue.hh b/src/cpu/o3/inst_queue.hh
index 0c3f44436bd3ef44467031701d634ba78208566c..5537a57e7bd4098f5a24a0847e61f99c1fd32a8d 100644 (file)
--- a/src/cpu/o3/inst_queue.hh
+++ b/src/cpu/o3/inst_queue.hh
@@ -42,7 +42,7 @@
 #include "cpu/o3/dep_graph.hh"
 #include "cpu/op_class.hh"
 #include "sim/eventq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class DerivO3CPUParams;
 class FUPool;

diff --git a/src/cpu/o3/ras.hh b/src/cpu/o3/ras.hh
index f0621c5b56ac9af997838b83a53f113d638dec84..e9a52fd37a9a028eaf3bb88f8640468ae78eaad8 100644 (file)
--- a/src/cpu/o3/ras.hh
+++ b/src/cpu/o3/ras.hh
@@ -31,7 +31,7 @@
 #ifndef __CPU_O3_RAS_HH__
 #define __CPU_O3_RAS_HH__
 
-#include "sim/host.hh"
+#include "base/types.hh"
 #include <vector>
 
 /** Return address stack class, implements a simple RAS. */

diff --git a/src/cpu/o3/sat_counter.hh b/src/cpu/o3/sat_counter.hh
index 7e15119b065d751cb9164cce2cb74e3899dc063c..7dd840f31a766f36e1ee03dbe9999748108c197a 100644 (file)
--- a/src/cpu/o3/sat_counter.hh
+++ b/src/cpu/o3/sat_counter.hh
@@ -32,7 +32,7 @@
 #define __CPU_O3_SAT_COUNTER_HH__
 
 #include "base/misc.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 /**
  * Private counter class for the internal saturating counters.

diff --git a/src/cpu/o3/store_set.hh b/src/cpu/o3/store_set.hh
index f9f7637d0d3783c043ef51ac3feaa7373ed02442..88f5e0d07bc4f5e9a392f69969c9831a8b6ab802 100644 (file)
--- a/src/cpu/o3/store_set.hh
+++ b/src/cpu/o3/store_set.hh
@@ -37,7 +37,7 @@
 #include <vector>
 
 #include "cpu/inst_seq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 struct ltseqnum {
     bool operator()(const InstSeqNum &lhs, const InstSeqNum &rhs) const

diff --git a/src/cpu/o3/tournament_pred.hh b/src/cpu/o3/tournament_pred.hh
index 47294491035c39046f758fc8d7ff9dec0327d398..31e539628a0c3f8e2406c28324a3ca0db633e500 100644 (file)
--- a/src/cpu/o3/tournament_pred.hh
+++ b/src/cpu/o3/tournament_pred.hh
@@ -32,7 +32,7 @@
 #define __CPU_O3_TOURNAMENT_PRED_HH__
 
 #include "cpu/o3/sat_counter.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include <vector>
 
 /**

diff --git a/src/cpu/ozone/ea_list.hh b/src/cpu/ozone/ea_list.hh
index d9e9d701fdb0cf396450cbb2c443048db567649a..eadd577a4b90c25c998bcc0e4a1017f12c958e9a 100644 (file)
--- a/src/cpu/ozone/ea_list.hh
+++ b/src/cpu/ozone/ea_list.hh
@@ -36,7 +36,7 @@
 #include <utility>
 
 #include "cpu/inst_seq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 /**
  * Simple class to hold onto a list of pairs, each pair having a memory

diff --git a/src/cpu/ozone/inst_queue.hh b/src/cpu/ozone/inst_queue.hh
index e840d5c21b0a5e344b0631f238cf876d591ade0e..8235760b4b511a75658807a3ce5733c2963ef6e5 100644 (file)
--- a/src/cpu/ozone/inst_queue.hh
+++ b/src/cpu/ozone/inst_queue.hh
@@ -39,7 +39,7 @@
 #include "base/statistics.hh"
 #include "base/timebuf.hh"
 #include "cpu/inst_seq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class FUPool;
 class MemInterface;

diff --git a/src/cpu/ozone/null_predictor.hh b/src/cpu/ozone/null_predictor.hh
index 0751338b7254fc57a621717590608251fefa9b9e..e930ca7d49ee9bc98ea23eb57f80ec59afa9511e 100644 (file)
--- a/src/cpu/ozone/null_predictor.hh
+++ b/src/cpu/ozone/null_predictor.hh
@@ -32,7 +32,7 @@
 #define __CPU_OZONE_NULL_PREDICTOR_HH__
 
 #include "cpu/inst_seq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 template <class Impl>
 class NullPredictor

diff --git a/src/cpu/pc_event.hh b/src/cpu/pc_event.hh
index 3709dcd59ba531cb1b86d5c89313467840272295..f26bbf3f23bf1a52fa3e54717436f62333331b61 100644 (file)
--- a/src/cpu/pc_event.hh
+++ b/src/cpu/pc_event.hh
@@ -35,7 +35,7 @@
 #include <vector>
 
 #include "base/misc.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 class PCEventQueue;

diff --git a/src/cpu/profile.hh b/src/cpu/profile.hh
index 27bb4efec9c54faa1bf0963f1c39b2ca054800cf..9606ed24d9747387fe0935c3a341ad2930c8bff4 100644 (file)
--- a/src/cpu/profile.hh
+++ b/src/cpu/profile.hh
@@ -35,7 +35,7 @@
 
 #include "arch/stacktrace.hh"
 #include "cpu/static_inst.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 

diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc
index 5058db0da58aa34c98301bb651f5821d12324554..ef9f2e712ee79803696fca316ca0652f90238f23 100644 (file)
--- a/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@ -51,7 +51,7 @@
 #include "mem/request.hh"
 #include "sim/byteswap.hh"
 #include "sim/debug.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_events.hh"
 #include "sim/sim_object.hh"
 #include "sim/stats.hh"

diff --git a/src/cpu/simple_thread.hh b/src/cpu/simple_thread.hh
index 3daa557910efea916cd51bbcbf8edaa36ed18cc8..7348a857657da4a2965d9abf41bb87a25c2348c4 100644 (file)
--- a/src/cpu/simple_thread.hh
+++ b/src/cpu/simple_thread.hh
@@ -41,7 +41,7 @@
 #include "mem/request.hh"
 #include "sim/byteswap.hh"
 #include "sim/eventq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/serialize.hh"
 
 class BaseCPU;

diff --git a/src/cpu/static_inst.hh b/src/cpu/static_inst.hh
index 1dc148ce6a13e1069c835e7b1b5b8bf0ab2be931..58a6b798639c665122922caaf5ef7bd04ab51b88 100644 (file)
--- a/src/cpu/static_inst.hh
+++ b/src/cpu/static_inst.hh
@@ -43,7 +43,7 @@
 #include "base/refcnt.hh"
 #include "cpu/op_class.hh"
 #include "sim/faults.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 // forward declarations
 struct AlphaSimpleImpl;

diff --git a/src/cpu/thread_context.hh b/src/cpu/thread_context.hh
index ca649b40e65f49a53c9f64bb408b62d3cae0b685..08b9b6e0cb01ca47d0ded0e254329a12e4fe0b24 100644 (file)
--- a/src/cpu/thread_context.hh
+++ b/src/cpu/thread_context.hh
@@ -36,7 +36,7 @@
 #include "config/full_system.hh"
 #include "mem/request.hh"
 #include "sim/faults.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/serialize.hh"
 #include "sim/byteswap.hh"
 

diff --git a/src/dev/alpha/backdoor.hh b/src/dev/alpha/backdoor.hh
index ad3c79823ee99aabe13c571592829e39bec093fa..6fae27d319d51a9011575cf298665c744d9085ab 100644 (file)
--- a/src/dev/alpha/backdoor.hh
+++ b/src/dev/alpha/backdoor.hh
@@ -39,7 +39,7 @@
 #include "dev/alpha/access.h"
 #include "dev/io_device.hh"
 #include "params/AlphaBackdoor.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 
 class BaseCPU;

diff --git a/src/dev/etherlink.hh b/src/dev/etherlink.hh
index 8f38fcab8160ebc2dd7f61dd4cdf3c8207a0767c..519e371525c72279566389bdbaca0c09dc3dfbf0 100644 (file)
--- a/src/dev/etherlink.hh
+++ b/src/dev/etherlink.hh
@@ -40,7 +40,7 @@
 #include "dev/etherpkt.hh"
 #include "params/EtherLink.hh"
 #include "sim/eventq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 #include "params/EtherLink.hh"
 

diff --git a/src/dev/etherpkt.hh b/src/dev/etherpkt.hh
index 623895ba8774efa5ed788178f48b5fdc7ec06e8a..4193a730225b7bfd2bfd51bf0cb386923e7e74a3 100644 (file)
--- a/src/dev/etherpkt.hh
+++ b/src/dev/etherpkt.hh
@@ -41,7 +41,7 @@
 #include <assert.h>
 
 #include "base/refcnt.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 /*
  * Reference counted class containing ethernet packet data

diff --git a/src/dev/intel_8254_timer.hh b/src/dev/intel_8254_timer.hh
index 1bc2ab87bbcc05aacae4c5b44f35eaa994af567b..69d80d81a5031cecd9ebe7110b7c923a54561e9f 100644 (file)
--- a/src/dev/intel_8254_timer.hh
+++ b/src/dev/intel_8254_timer.hh
@@ -38,7 +38,7 @@
 
 #include "base/bitunion.hh"
 #include "sim/eventq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/serialize.hh"
 
 /** Programmable Interval Timer (Intel 8254) */

diff --git a/src/dev/mips/backdoor.hh b/src/dev/mips/backdoor.hh
index b8cc0ae46ff3b553fd218861e26e78f3fbc4d88d..f8995b72b02ff4658540b68d776be66e05f3a39e 100755 (executable)
--- a/src/dev/mips/backdoor.hh
+++ b/src/dev/mips/backdoor.hh
@@ -39,7 +39,7 @@
 #include "dev/mips/access.h"
 #include "dev/io_device.hh"
 #include "params/MipsBackdoor.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 
 class BaseCPU;

diff --git a/src/dev/ns_gige.cc b/src/dev/ns_gige.cc
index fb344629926408bb3d0ec6b4e5867490e8cbb34d..ecaebb663ad3a2d5dc6817c49d8dede4b1d283c0 100644 (file)
--- a/src/dev/ns_gige.cc
+++ b/src/dev/ns_gige.cc
@@ -45,7 +45,7 @@
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "params/NSGigE.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/system.hh"
 
 const char *NsRxStateStrings[] =

diff --git a/src/dev/sinic.cc b/src/dev/sinic.cc
index 37c6a8259fb470df7ed0f2037dffdf8fe6c8a943..ce9ac5984fb6aba24df1d9d2c261c8e70634ba77 100644 (file)
--- a/src/dev/sinic.cc
+++ b/src/dev/sinic.cc
@@ -42,7 +42,7 @@
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "sim/eventq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/stats.hh"
 
 using namespace std;

diff --git a/src/kern/tru64/dump_mbuf.cc b/src/kern/tru64/dump_mbuf.cc
index e6bfc06d9d3fd82803b30578ef4c402a266573d9..2cc0d15fde3b24f91f1e6ef443a82818549378ec 100644 (file)
--- a/src/kern/tru64/dump_mbuf.cc
+++ b/src/kern/tru64/dump_mbuf.cc
@@ -36,7 +36,7 @@
 #include "base/loader/symtab.hh"
 #include "cpu/thread_context.hh"
 #include "kern/tru64/mbuf.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/system.hh"
 #include "sim/arguments.hh"
 #include "arch/isa_traits.hh"

diff --git a/src/kern/tru64/mbuf.hh b/src/kern/tru64/mbuf.hh
index 78b5ead7a82a683b5bb4083e19b2d57eef78b108..b1b86ef47d33cdd23500b8eed293ee33270b39e5 100644 (file)
--- a/src/kern/tru64/mbuf.hh
+++ b/src/kern/tru64/mbuf.hh
@@ -31,7 +31,7 @@
 #ifndef __MBUF_HH__
 #define __MBUF_HH__
 
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "arch/isa_traits.hh"
 
 namespace tru64 {

diff --git a/src/kern/tru64/printf.cc b/src/kern/tru64/printf.cc
index 8b706c25097f89f6c7907ffe53f0cbdf1fed56fc..921b028a553d5cf043103484ee174a45efce99d7 100644 (file)
--- a/src/kern/tru64/printf.cc
+++ b/src/kern/tru64/printf.cc
@@ -34,7 +34,7 @@
 #include "arch/vtophys.hh"
 #include "base/cprintf.hh"
 #include "base/trace.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/arguments.hh"
 
 using namespace std;

diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh
index 82db7750c9bdc408f8e8b6906ec8882aad2f43ae..cf738a340f624ec1aeba2c38f57d6d238189a74a 100644 (file)
--- a/src/mem/cache/cache_impl.hh
+++ b/src/mem/cache/cache_impl.hh
@@ -37,7 +37,7 @@
  * Cache definitions.
  */
 
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/fast_alloc.hh"
 #include "base/misc.hh"
 #include "base/range.hh"

diff --git a/src/mem/cache/mshr.cc b/src/mem/cache/mshr.cc
index 9ec9c090cbf3ed07455e2399734dd7b51b521bd0..ee267feb87be614ec14933739083ec8c9cc2244d 100644 (file)
--- a/src/mem/cache/mshr.cc
+++ b/src/mem/cache/mshr.cc
@@ -41,7 +41,7 @@
 
 #include "mem/cache/mshr.hh"
 #include "sim/core.hh" // for curTick
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/misc.hh"
 #include "mem/cache/cache.hh"
 

diff --git a/src/mem/cache/tags/iic_repl/gen.cc b/src/mem/cache/tags/iic_repl/gen.cc
index 487b227da1ada80ab914c4802c0bc8563c09b9a0..1c19420da7d8039672a5393a3bd91898c6d64f62 100644 (file)
--- a/src/mem/cache/tags/iic_repl/gen.cc
+++ b/src/mem/cache/tags/iic_repl/gen.cc
@@ -40,7 +40,7 @@
 #include "mem/cache/tags/iic.hh"
 #include "mem/cache/tags/iic_repl/gen.hh"
 #include "params/GenRepl.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 using namespace std;
 

diff --git a/src/mem/cache/tags/iic_repl/repl.hh b/src/mem/cache/tags/iic_repl/repl.hh
index cdb5ae4b8ddfaf6076e5e32ca7364ead976d829f..91a4cc3097f090c1e9ce1884010e6cd1ebd60510 100644 (file)
--- a/src/mem/cache/tags/iic_repl/repl.hh
+++ b/src/mem/cache/tags/iic_repl/repl.hh
@@ -42,7 +42,7 @@
 #include <list>
 
 #include "cpu/smt.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 
 

diff --git a/src/mem/packet.hh b/src/mem/packet.hh
index eaffd530eab0735a809560ec1a8a563524719daa..14c6c40a4bcf44e759c49819a3a9dfb5efea0635 100644 (file)
--- a/src/mem/packet.hh
+++ b/src/mem/packet.hh
@@ -49,7 +49,7 @@
 #include "base/misc.hh"
 #include "base/printable.hh"
 #include "mem/request.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/core.hh"
 
 

diff --git a/src/mem/page_table.hh b/src/mem/page_table.hh
index d4101c6bf4474467cde9f1581685a121330220a9..461b07a6953ba17ee99282148e8886dd560d6b51 100644 (file)
--- a/src/mem/page_table.hh
+++ b/src/mem/page_table.hh
@@ -43,7 +43,7 @@
 #include "arch/tlb.hh"
 #include "base/hashmap.hh"
 #include "mem/request.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/serialize.hh"
 
 class Process;

diff --git a/src/mem/physical.cc b/src/mem/physical.cc
index 4a521717e85d10f9c311f4553be92eb3927d7ff1..56849b12d681a5a95f25e8838b4270f867519942 100644 (file)
--- a/src/mem/physical.cc
+++ b/src/mem/physical.cc
@@ -46,7 +46,7 @@
 #include "mem/packet_access.hh"
 #include "mem/physical.hh"
 #include "sim/eventq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 using namespace std;
 using namespace TheISA;

diff --git a/src/mem/request.hh b/src/mem/request.hh
index 546774d136aa832eca44d1ee7a7711e6a9d6548f..3915fa683f116f0a7ab8f0e6e0a21eaa04cefc6e 100644 (file)
--- a/src/mem/request.hh
+++ b/src/mem/request.hh
@@ -44,7 +44,7 @@
 #include "base/fast_alloc.hh"
 #include "base/flags.hh"
 #include "base/misc.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/core.hh"
 
 class Request;

diff --git a/src/mem/rubymem.cc b/src/mem/rubymem.cc
index 6a22830ef241a2f31cd7d3599443fb1858017dd0..911d533a0fc9a8f09bbd482526803b9c8ae63789 100644 (file)
--- a/src/mem/rubymem.cc
+++ b/src/mem/rubymem.cc
@@ -32,7 +32,7 @@
 #include "arch/isa_traits.hh"
 #include "mem/rubymem.hh"
 #include "sim/eventq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/output.hh"
 
 // Ruby includes

diff --git a/src/python/m5/params.py b/src/python/m5/params.py
index 18eeac0d1ddea15870cc543052e0f070b1d2b3e3..edd78fa28818a7b6708ffb7077fb86b4ced3ce57 100644 (file)
--- a/src/python/m5/params.py
+++ b/src/python/m5/params.py
@@ -317,12 +317,12 @@ class CheckedIntType(MetaParamValue):
 
         if not cls.cxx_predecls:
             # most derived types require this, so we just do it here once
-            cls.cxx_predecls = ['#include "sim/host.hh"']
+            cls.cxx_predecls = ['#include "base/types.hh"']
 
         if not cls.swig_predecls:
             # most derived types require this, so we just do it here once
             cls.swig_predecls = ['%import "stdint.i"\n' +
-                                 '%import "sim/host.hh"']
+                                 '%import "base/types.hh"']
 
         if not (hasattr(cls, 'min') and hasattr(cls, 'max')):
             if not (hasattr(cls, 'size') and hasattr(cls, 'unsigned')):
@@ -766,9 +766,9 @@ frequency_tolerance = 0.001  # 0.1%
 
 class TickParamValue(NumericParamValue):
     cxx_type = 'Tick'
-    cxx_predecls = ['#include "sim/host.hh"']
+    cxx_predecls = ['#include "base/types.hh"']
     swig_predecls = ['%import "stdint.i"\n' +
-                     '%import "sim/host.hh"']
+                     '%import "base/types.hh"']
 
     def getValue(self):
         return long(self.value)
@@ -844,9 +844,9 @@ class Frequency(TickParamValue):
 # An explicit conversion to a Latency or Frequency must be made first.
 class Clock(ParamValue):
     cxx_type = 'Tick'
-    cxx_predecls = ['#include "sim/host.hh"']
+    cxx_predecls = ['#include "base/types.hh"']
     swig_predecls = ['%import "stdint.i"\n' +
-                     '%import "sim/host.hh"']
+                     '%import "base/types.hh"']
     def __init__(self, value):
         if isinstance(value, (Latency, Clock)):
             self.ticks = value.ticks

diff --git a/src/python/swig/core.i b/src/python/swig/core.i
index c567bea4dfae6dbc765a7ad543bbef04491912a0..eefe106a4fd253df04451160fe562f5aa7d2df97 100644 (file)
--- a/src/python/swig/core.i
+++ b/src/python/swig/core.i
@@ -37,7 +37,7 @@
 #include "base/misc.hh"
 #include "base/socket.hh"
 #include "sim/core.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/startup.hh"
 
 extern const char *compileDate;
@@ -59,7 +59,7 @@ inline void disableAllListeners() { ListenSocket::disableAll(); }
 
 %include "stdint.i"
 %include "std_string.i"
-%include "sim/host.hh"
+%include "base/types.hh"
 
 void setOutputDir(const std::string &dir);
 void SimStartup();

diff --git a/src/python/swig/debug.i b/src/python/swig/debug.i
index 1084d69366cd4f24e2c4b7792c6bdee4963ef63c..b7fdb2171eef41b340250d166fa490e682bbe1c8 100644 (file)
--- a/src/python/swig/debug.i
+++ b/src/python/swig/debug.i
@@ -31,12 +31,12 @@
 %module debug
 
 %{
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/debug.hh"
 %}
 
 %include "stdint.i"
-%include "sim/host.hh"
+%include "base/types.hh"
 %include "sim/debug.hh"
 
 %wrapper %{

diff --git a/src/python/swig/event.i b/src/python/swig/event.i
index b40e59a4b711fd374efc66b5d202a62e48fdd38b..c09f12016eaf072e94bef70a52e19aa4122b28f4 100644 (file)
--- a/src/python/swig/event.i
+++ b/src/python/swig/event.i
@@ -32,7 +32,7 @@
 
 %{
 #include "python/swig/pyevent.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_events.hh"
 #include "sim/sim_exit.hh"
@@ -75,7 +75,7 @@
 
 %include "stdint.i"
 %include "std_string.i"
-%include "sim/host.hh"
+%include "base/types.hh"
 %include "sim/eventq.hh"
 %include "python/swig/pyevent.hh"
 

diff --git a/src/python/swig/pyobject.hh b/src/python/swig/pyobject.hh
index e895be636fd31ab948a6814087dfce84515de077..d11dc323c93fae92b70bae5b78cd99fad1d82594 100644 (file)
--- a/src/python/swig/pyobject.hh
+++ b/src/python/swig/pyobject.hh
@@ -31,7 +31,7 @@
 #include <Python.h>
 
 #include "cpu/base.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/serialize.hh"
 #include "sim/sim_object.hh"
 #include "sim/system.hh"

diff --git a/src/python/swig/random.i b/src/python/swig/random.i
index 657a59780c2bd767607befac54c9d098bc2e8005..d9ea2a404585f2d92fe30b7e976129d57f809829 100644 (file)
--- a/src/python/swig/random.i
+++ b/src/python/swig/random.i
@@ -35,7 +35,7 @@
 %{
 #include <cstdlib>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 inline void
 seed(uint64_t seed)

diff --git a/src/python/swig/range.i b/src/python/swig/range.i
index 309e6a8bac5dbe7922f99bc9250e6c8425b4f492..659bde8d786cbd22f2ca5e35fa1011f6aef0e4e3 100644 (file)
--- a/src/python/swig/range.i
+++ b/src/python/swig/range.i
@@ -31,7 +31,7 @@
 %rename(assign) *::operator=;
 
 %include "base/range.hh"
-%include "sim/host.hh"
+%include "base/types.hh"
 
 %template(AddrRange) Range<Addr>;
 %template(TickRange) Range<Tick>;

diff --git a/src/python/swig/sim_object.i b/src/python/swig/sim_object.i
index 2280fc0e3a81b920266ab02cf789bfc25a03bab8..840aea998fe1ff6177a9b74cda2c6d0c1b3e4e50 100644 (file)
--- a/src/python/swig/sim_object.i
+++ b/src/python/swig/sim_object.i
@@ -37,7 +37,7 @@
 // import these files for SWIG to wrap
 %include "stdint.i"
 %include "std_string.i"
-%include "sim/host.hh"
+%include "base/types.hh"
 
 class BaseCPU;
 

diff --git a/src/python/swig/trace.i b/src/python/swig/trace.i
index 69b44c025957241965e6edad3773055c88af5408..57ab3d3ec854c800945750fba1291fa29db5be39 100644 (file)
--- a/src/python/swig/trace.i
+++ b/src/python/swig/trace.i
@@ -32,7 +32,7 @@
 
 %{
 #include "base/trace.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 inline void
 output(const char *filename)

diff --git a/src/sim/arguments.hh b/src/sim/arguments.hh
index 14c9e1f8ab196da541ff25d7cdde6ab6c28d09ba..3cef49e5de0da461eb6a1e7770de8b66b716a347 100644 (file)
--- a/src/sim/arguments.hh
+++ b/src/sim/arguments.hh
@@ -36,7 +36,7 @@
 #include "arch/vtophys.hh"
 #include "base/refcnt.hh"
 #include "mem/vport.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class ThreadContext;
 

diff --git a/src/sim/byteswap.hh b/src/sim/byteswap.hh
index 2519e552bb7219dfa5063d9f62ef053447f5798c..fc36bdf3324c352808c1ff181aec705c32e89944 100644 (file)
--- a/src/sim/byteswap.hh
+++ b/src/sim/byteswap.hh
@@ -39,7 +39,7 @@
 
 #include "base/bigint.hh"
 #include "base/misc.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 // This lets us figure out what the byte order of the host system is
 #if defined(linux)

diff --git a/src/sim/core.hh b/src/sim/core.hh
index 50cb2ef59a11b22182b49b73cc1701ab8ab39cf3..c1a363689e7ffc5b14062887953f8af41cb7dbde 100644 (file)
--- a/src/sim/core.hh
+++ b/src/sim/core.hh
@@ -34,7 +34,7 @@
 
 #include <string>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 /// The universal simulation clock.
 extern Tick curTick;

diff --git a/src/sim/debug.hh b/src/sim/debug.hh
index 7dafb8394943e716002d2aef95c2dd88c8fb9642..ca7a606c629f2db28ecb8bae85a6b157faf2d977 100644 (file)
--- a/src/sim/debug.hh
+++ b/src/sim/debug.hh
@@ -31,7 +31,7 @@
 #ifndef __SIM_DEBUG_HH__
 #define __SIM_DEBUG_HH__
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 void schedBreakCycle(Tick when);
 

diff --git a/src/sim/eventq.hh b/src/sim/eventq.hh
index 33bb342524bb2965243c5c7880eee55b2ee00ef2..219d306f05a7d60201415f5da3a57d8ba4c05456 100644 (file)
--- a/src/sim/eventq.hh
+++ b/src/sim/eventq.hh
@@ -48,7 +48,7 @@
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "sim/serialize.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class EventQueue;       // forward declaration
 

diff --git a/src/sim/host.hh b/src/sim/host.hh
deleted file mode 100644 (file)
index dd29534..0000000
--- a/src/sim/host.hh
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2003-2005 The Regents of The University of Michigan
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Authors: Nathan Binkert
- */
-
-/**
- * @file
- * Defines host-dependent types:
- * Counter, Tick, and (indirectly) {int,uint}{8,16,32,64}_t.
- */
-
-#ifndef __HOST_HH__
-#define __HOST_HH__
-
-#include <inttypes.h>
-
-/** uint64_t constant */
-#define ULL(N)          ((uint64_t)N##ULL)
-/** int64_t constant */
-#define LL(N)           ((int64_t)N##LL)
-
-/** Statistics counter type.  Not much excuse for not using a 64-bit
- * integer here, but if you're desperate and only run short
- * simulations you could make this 32 bits.
- */
-typedef int64_t Counter;
-
-/**
- * Clock cycle count type.
- * @note using an unsigned breaks the cache.
- */
-typedef int64_t Tick;
-
-const Tick MaxTick = LL(0x7fffffffffffffff);
-
-/**
- * Address type
- * This will probably be moved somewhere else in the near future.
- * This should be at least as big as the biggest address width in use
- * in the system, which will probably be 64 bits.
- */
-typedef uint64_t Addr;
-
-const Addr MaxAddr = (Addr)-1;
-
-#endif // __HOST_H__

diff --git a/src/sim/init.cc b/src/sim/init.cc
index 66eddfb6fa1dc919b930f8051717d14e6224cd10..2e34740fbc409a86b9338b4bc241f7a01750641d 100644 (file)
--- a/src/sim/init.cc
+++ b/src/sim/init.cc
@@ -41,7 +41,7 @@
 #include "base/misc.hh"
 #include "sim/async.hh"
 #include "sim/core.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/init.hh"
 
 using namespace std;

diff --git a/src/sim/insttracer.hh b/src/sim/insttracer.hh
index 9fb5f9f228d5af3ffa8f898b30576bd6e08635dd..23a0a14a6c9e6a8e5b005e7f23881e62cf86c3d7 100644 (file)
--- a/src/sim/insttracer.hh
+++ b/src/sim/insttracer.hh
@@ -36,7 +36,7 @@
 #include "base/trace.hh"
 #include "cpu/inst_seq.hh"      // for InstSeqNum
 #include "cpu/static_inst.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 
 class ThreadContext;

diff --git a/src/sim/process.hh b/src/sim/process.hh
index 5272094677cee929779763d8ff95165badbee75e..db52e16978a48d2ea41f9b250ccb59ebc27a7025 100644 (file)
--- a/src/sim/process.hh
+++ b/src/sim/process.hh
@@ -46,7 +46,7 @@
 
 #include "arch/types.hh"
 #include "base/statistics.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 #include "sim/syscallreturn.hh"
 

diff --git a/src/sim/pseudo_inst.hh b/src/sim/pseudo_inst.hh
index 30996fc3bfabff4555749aacc13f3dcb3225680c..847dcede0465aabd638f8eaa60228bd16174a7a6 100644 (file)
--- a/src/sim/pseudo_inst.hh
+++ b/src/sim/pseudo_inst.hh
@@ -31,7 +31,7 @@
 class ThreadContext;
 
 //We need the "Tick" and "Addr" data types from here
-#include "sim/host.hh"
+#include "base/types.hh"
 
 namespace PseudoInst {
 

diff --git a/src/sim/serialize.hh b/src/sim/serialize.hh
index c336330654286e1e617aa823fcb483f3d130f8d7..0069f56144d0d95b2edd6714f250e7b15e8e94f9 100644 (file)
--- a/src/sim/serialize.hh
+++ b/src/sim/serialize.hh
@@ -43,7 +43,7 @@
 #include <iostream>
 #include <map>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 class IniFile;
 class Serializable;

diff --git a/src/sim/sim_exit.hh b/src/sim/sim_exit.hh
index 174b0002415a92ac1264a5e15e8435e21b3e7801..11750293228ef20d2855cdb134636ceb72ae2b19 100644 (file)
--- a/src/sim/sim_exit.hh
+++ b/src/sim/sim_exit.hh
@@ -34,7 +34,7 @@
 
 #include <string>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 
 // forward declaration
 class Callback;

diff --git a/src/sim/sim_object.cc b/src/sim/sim_object.cc
index dad8f6e8b871b47cfac75e945b0b5a45d3ddeb8b..81ab00f9ea15c6ac9eb7ecd780b057628d4e85f3 100644 (file)
--- a/src/sim/sim_object.cc
+++ b/src/sim/sim_object.cc
@@ -37,7 +37,7 @@
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "base/stats/events.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_object.hh"
 #include "sim/stats.hh"
 

diff --git a/src/sim/simulate.cc b/src/sim/simulate.cc
index 1ac2c80df54537ae4737ce812a2332d4f819ef22..2d3b84e0955c50505d22dc7f1fba9c1aa3fce1ee 100644 (file)
--- a/src/sim/simulate.cc
+++ b/src/sim/simulate.cc
@@ -34,7 +34,7 @@
 #include "sim/stat_control.hh"
 #include "sim/async.hh"
 #include "sim/eventq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_events.hh"
 #include "sim/sim_exit.hh"
 #include "sim/simulate.hh"

diff --git a/src/sim/simulate.hh b/src/sim/simulate.hh
index 139bddb8257ff8b54beb9f5f607082c0e2ce5028..978082f825b3c1cb4604ecb666b24efd2a8e619c 100644 (file)
--- a/src/sim/simulate.hh
+++ b/src/sim/simulate.hh
@@ -29,7 +29,7 @@
  *          Steve Reinhardt
  */
 
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "sim/sim_events.hh"
 
 SimLoopExitEvent *simulate(Tick num_cycles = MaxTick);

diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh
index e995bd487fc1af3a25b13555de1ceeea29b0c14b..4831419b0c0c0e6f0d86b7ed74ef2e8166895351 100644 (file)
--- a/src/sim/syscall_emul.hh
+++ b/src/sim/syscall_emul.hh
@@ -50,7 +50,7 @@
 #include <fcntl.h>
 #include <sys/uio.h>
 
-#include "sim/host.hh"  // for Addr
+#include "base/types.hh"
 #include "base/chunk_generator.hh"
 #include "base/intmath.hh"      // for RoundUp
 #include "base/misc.hh"

diff --git a/src/unittest/rangemaptest.cc b/src/unittest/rangemaptest.cc
index 36223ed9ce80ea546df210046ba0f5683875578a..a6476624f0083a47ddf7a3eba6dca879674c6520 100644 (file)
--- a/src/unittest/rangemaptest.cc
+++ b/src/unittest/rangemaptest.cc
@@ -30,7 +30,7 @@
 
 #include <iostream>
 #include <cassert>
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/range_map.hh"
 
 using namespace std;

diff --git a/src/unittest/rangemultimaptest.cc b/src/unittest/rangemultimaptest.cc
index a110256c961751efd9784d05ee7d364298ba06a1..ec68ba35abf2fa117cfa71252f030d18dd9e7de4 100644 (file)
--- a/src/unittest/rangemultimaptest.cc
+++ b/src/unittest/rangemultimaptest.cc
@@ -31,7 +31,7 @@
 #include <cassert>
 #include <iostream>
 
-#include "sim/host.hh"
+#include "base/types.hh"
 #include "base/range_map.hh"
 
 using namespace std;

diff --git a/src/unittest/stattest.cc b/src/unittest/stattest.cc
index 3934786ec4cd25e467ab9185b927d6403f630d93..9c10d078c8e72cbe60b58169365315899b236dcf 100644 (file)
--- a/src/unittest/stattest.cc
+++ b/src/unittest/stattest.cc
@@ -37,7 +37,7 @@
 #include "base/statistics.hh"
 #include "base/stats/text.hh"
 #include "base/stats/mysql.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
 
 using namespace std;
 using namespace Stats;