includes: use base/types.hh not inttypes.h or stdint.h

diff --git a/src/arch/sparc/types.hh b/src/arch/sparc/types.hh
index dd369cc265d2dfbcb585f45757d2b9e7628d48eb..501e2e8cb070c82b037b8992db8f046ec45c300e 100644 (file)
--- a/src/arch/sparc/types.hh
+++ b/src/arch/sparc/types.hh
@@ -31,8 +31,8 @@
 #ifndef __ARCH_SPARC_TYPES_HH__
 #define __ARCH_SPARC_TYPES_HH__
 
-#include <inttypes.h>
 #include "base/bigint.hh"
+#include "base/types.hh"
 
 namespace SparcISA
 {

diff --git a/src/arch/x86/cpuid.hh b/src/arch/x86/cpuid.hh
index 5cb4c7972a288eecc7086d55fd6bfa099619b8dc..d8b013ba1e04cb57592443f3ee5503dd81487e9e 100644 (file)
--- a/src/arch/x86/cpuid.hh
+++ b/src/arch/x86/cpuid.hh
@@ -31,7 +31,7 @@
 #ifndef __ARCH_X86_CPUID_HH__
 #define __ARCH_X86_CPUID_HH__
 
-#include <inttypes.h>
+#include "base/types.hh"
 
 class ThreadContext;
 

diff --git a/src/arch/x86/types.hh b/src/arch/x86/types.hh
index 29420352b2f1c821a0bc4c1741c00b92cd095347..c06d664ebd4417f2d4a14cd2b88938fa223ddd82 100644 (file)
--- a/src/arch/x86/types.hh
+++ b/src/arch/x86/types.hh
@@ -58,11 +58,11 @@
 #ifndef __ARCH_X86_TYPES_HH__
 #define __ARCH_X86_TYPES_HH__
 
-#include <inttypes.h>
 #include <iostream>
 
 #include "base/bitunion.hh"
 #include "base/cprintf.hh"
+#include "base/types.hh"
 
 namespace X86ISA
 {

diff --git a/src/base/bitfield.hh b/src/base/bitfield.hh
index 664093fa27fc96145ce16448afadf3264c7c3eee..28093a5d44e45e8732f885eefcfdd56b0b98b666 100644 (file)
--- a/src/base/bitfield.hh
+++ b/src/base/bitfield.hh
@@ -32,7 +32,7 @@
 #ifndef __BASE_BITFIELD_HH__
 #define __BASE_BITFIELD_HH__
 
-#include <inttypes.h>
+#include "base/types.hh"
 
 /**
  * Generate a 64-bit mask of 'nbits' 1s, right justified.

diff --git a/src/base/bitunion.hh b/src/base/bitunion.hh
index 8ba28f3ba71222e485a75ee88e01dfce6dcd6362..c61d1cc7c60a85e76d81e1e582dde5ed693cd42d 100644 (file)
--- a/src/base/bitunion.hh
+++ b/src/base/bitunion.hh
@@ -31,8 +31,8 @@
 #ifndef __BASE_BITUNION_HH__
 #define __BASE_BITUNION_HH__
 
-#include <inttypes.h>
 #include "base/bitfield.hh"
+#include "base/types.hh"
 
 //      The following implements the BitUnion system of defining bitfields
 //on top of an underlying class. This is done through the pervasive use of

diff --git a/src/base/compression/base.hh b/src/base/compression/base.hh
index 8d1f8d6b56d813b1e82352ee7f7684e5503efb5c..d80660ac3045cf92ed0908c5d90b15c71500db1e 100644 (file)
--- a/src/base/compression/base.hh
+++ b/src/base/compression/base.hh
@@ -37,7 +37,7 @@
  * This file defines a base (abstract virtual) compression algorithm object.
  */
 
-#include <inttypes.h>
+#include "base/types.hh"
 
 /**
  * Abstract virtual compression algorithm object.

diff --git a/src/kern/linux/linux.hh b/src/kern/linux/linux.hh
index ad35fa726d33605cdb3233a12d089a90da770aaf..7c16228ea194288e786d3f0bc9962dcc6bb586b8 100644 (file)
--- a/src/kern/linux/linux.hh
+++ b/src/kern/linux/linux.hh
@@ -30,6 +30,8 @@
 
 #ifndef __LINUX_HH__
 #define __LINUX_HH__
+
+#include "base/types.hh"
 #include "config/full_system.hh"
 
 #if FULL_SYSTEM
@@ -38,7 +40,6 @@ class Linux {};
 
 #else //!FULL_SYSTEM
 
-#include <inttypes.h>
 #include <string>
 
 #include "kern/operatingsystem.hh"

diff --git a/src/kern/operatingsystem.hh b/src/kern/operatingsystem.hh
index 712b97c3588339711e22ec8e33461ec436ba71ef..47e64ffd93ef387a3a0d2c733cba5b200e2e17e6 100644 (file)
--- a/src/kern/operatingsystem.hh
+++ b/src/kern/operatingsystem.hh
@@ -31,10 +31,9 @@
 #ifndef __KERN_OPERATINGSYSTEM_HH__
 #define __KERN_OPERATINGSYSTEM_HH__
 
+#include "base/types.hh"
 #include "config/full_system.hh"
 
-#include <inttypes.h>
-
 #if FULL_SYSTEM
 
 class OperatingSystem {};

diff --git a/src/kern/solaris/solaris.hh b/src/kern/solaris/solaris.hh
index a55ce2c80cb046a55eadc2cf4bc7d84bcdcca4eb..00eee994b58bb0bd92c14ee1507d36b0be9056af 100644 (file)
--- a/src/kern/solaris/solaris.hh
+++ b/src/kern/solaris/solaris.hh
@@ -30,6 +30,8 @@
 
 #ifndef __SOLARIS_HH__
 #define __SOLARIS_HH__
+
+#include "base/types.hh"
 #include "config/full_system.hh"
 
 #if FULL_SYSTEM
@@ -38,8 +40,6 @@ class Solaris {};
 
 #else //!FULL_SYSTEM
 
-#include <inttypes.h>
-
 #include "kern/operatingsystem.hh"
 
 class TranslatingPort;

diff --git a/src/mem/bridge.hh b/src/mem/bridge.hh
index 40f033811277e5ac453b4807680045d1d2be0d94..0583b29a6eb67c40040a5108fd0128ee83a6a21e 100644 (file)
--- a/src/mem/bridge.hh
+++ b/src/mem/bridge.hh
@@ -39,10 +39,10 @@
 
 #include <string>
 #include <list>
-#include <inttypes.h>
 #include <queue>
 
 #include "base/fast_alloc.hh"
+#include "base/types.hh"
 #include "mem/mem_object.hh"
 #include "mem/packet.hh"
 #include "mem/port.hh"

diff --git a/src/mem/bus.hh b/src/mem/bus.hh
index 74901d6268dac9a9c69823e15e605ec58b0e31ff..a55e37e59867118d1f489d168fa04647d4d8ca5c 100644 (file)
--- a/src/mem/bus.hh
+++ b/src/mem/bus.hh
@@ -40,11 +40,11 @@
 #include <string>
 #include <set>
 #include <list>
-#include <inttypes.h>
 
 #include "base/range.hh"
 #include "base/hashmap.hh"
 #include "base/range_map.hh"
+#include "base/types.hh"
 #include "mem/mem_object.hh"
 #include "mem/packet.hh"
 #include "mem/port.hh"

diff --git a/src/mem/cache/base.hh b/src/mem/cache/base.hh
index d33c655d73d74f5afaa685499d3dacfa2b52527c..b77427c90bb158254a5942b61bc2f49bd86283db 100644 (file)
--- a/src/mem/cache/base.hh
+++ b/src/mem/cache/base.hh
@@ -42,11 +42,11 @@
 #include <string>
 #include <list>
 #include <algorithm>
-#include <inttypes.h>
 
 #include "base/misc.hh"
 #include "base/statistics.hh"
 #include "base/trace.hh"
+#include "base/types.hh"
 #include "mem/cache/mshr_queue.hh"
 #include "mem/mem_object.hh"
 #include "mem/packet.hh"

diff --git a/src/mem/port.hh b/src/mem/port.hh
index 1d9135ae678552566fa92488a777e23f078eb29b..e738cfc6314821e88d6dab638605db4d07d877b1 100644 (file)
--- a/src/mem/port.hh
+++ b/src/mem/port.hh
@@ -41,10 +41,10 @@
 #define __MEM_PORT_HH__
 
 #include <list>
-#include <inttypes.h>
 
 #include "base/misc.hh"
 #include "base/range.hh"
+#include "base/types.hh"
 #include "mem/packet.hh"
 #include "mem/request.hh"
 #include "sim/eventq.hh"

diff --git a/src/sim/syscallreturn.hh b/src/sim/syscallreturn.hh
index d1c43f5845af4200853a0ddfa1823d7ad5e35c57..385ff55db1426780fc202bf300a045a6d28ed626 100644 (file)
--- a/src/sim/syscallreturn.hh
+++ b/src/sim/syscallreturn.hh
@@ -31,7 +31,7 @@
 #ifndef __SIM_SYSCALLRETURN_HH__
 #define __SIM_SYSCALLRETURN_HH__
 
-#include <inttypes.h>
+#include "base/types.hh"
 
 class SyscallReturn
 {