16 files changed, 15 insertions, 86 deletions
diff --git a/src/sim/arguments.hh b/src/sim/arguments.hh
index 14c9e1f8a..3cef49e5d 100644
--- 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 2519e552b..fc36bdf33 100644
--- 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 50cb2ef59..c1a363689 100644
--- 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 7dafb8394..ca7a606c6 100644
--- 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 33bb34252..219d306f0 100644
--- 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
index dd29534fd..000000000
--- 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 66eddfb6f..2e34740fb 100644
--- 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 9fb5f9f22..23a0a14a6 100644
--- 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 527209467..db52e1697 100644
--- 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 30996fc3b..847dcede0 100644
--- 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 c33633065..0069f5614 100644
--- 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 174b00024..117502932 100644
--- 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 dad8f6e8b..81ab00f9e 100644
--- 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 1ac2c80df..2d3b84e09 100644
--- 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 139bddb82..978082f82 100644
--- 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 e995bd487..4831419b0 100644
--- 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"