Merge ARM into the head. ARM will compile but may not actually work.

9 files changed, 388 insertions, 419 deletions

diff --git a/src/base/loader/aout_object.cc b/src/base/loader/aout_object.cc
index 8fbad8030..1412adfc3 100644
--- a/src/base/loader/aout_object.cc
+++ b/src/base/loader/aout_object.cc
@@ -34,7 +34,7 @@
 
 #include "base/loader/symtab.hh"
 
-#include "base/trace.hh"	// for DPRINTF
+#include "base/trace.hh"        // for DPRINTF
 
 #include "base/loader/exec_aout.h"
 
diff --git a/src/base/loader/coff_sym.h b/src/base/loader/coff_sym.h
index 4c6540395..be0631141 100644
--- a/src/base/loader/coff_sym.h
+++ b/src/base/loader/coff_sym.h
@@ -65,7 +65,7 @@
  *
  * Symbols are assumed to be in 'encounter order' - i.e. the order that
  * the things they represent were encountered by the compiler/assembler/loader.
- * EXCEPT for globals!	These are assumed to be bunched together,
+ * EXCEPT for globals!  These are assumed to be bunched together,
  * probably right after the last 'normal' symbol.  Globals ARE sorted
  * in ascending order.
  *
@@ -76,13 +76,13 @@
  * All "ifooMax" values are the highest legal value PLUS ONE. This makes
  * them good for allocating arrays, etc. All checks are "ifoo < ifooMax".
  *
- * "isym"	Index into the SYMbol table.
- * "ipd"	Index into the Procedure Descriptor array.
- * "ifd"	Index into the File Descriptor array.
- * "iss"	Index into String Space.
- * "cb"		Count of Bytes.
- * "rgPd"	array whose domain is "0..ipdMax-1" and RanGe is PDR.
- * "rgFd"	array whose domain is "0..ifdMax-1" and RanGe is FDR.
+ * "isym"       Index into the SYMbol table.
+ * "ipd"        Index into the Procedure Descriptor array.
+ * "ifd"        Index into the File Descriptor array.
+ * "iss"        Index into String Space.
+ * "cb"         Count of Bytes.
+ * "rgPd"       array whose domain is "0..ipdMax-1" and RanGe is PDR.
+ * "rgFd"       array whose domain is "0..ifdMax-1" and RanGe is FDR.
  */
 
 
@@ -97,31 +97,31 @@
  */
 
 typedef struct ecoff_symhdr {
-    coff_short	magic;		/* to verify validity of the table */
-    coff_short	vstamp;		/* version stamp */
-    coff_int	ilineMax;	/* number of line number entries */
-    coff_int	idnMax;		/* max index into dense number table */
-    coff_int	ipdMax;		/* number of procedures */
-    coff_int	isymMax;	/* number of local symbols */
-    coff_int	ioptMax;	/* max index into optimization symbol entries */
-    coff_int	iauxMax;	/* number of auxillary symbol entries */
-    coff_int	issMax;		/* max index into local strings */
-    coff_int	issExtMax;	/* max index into external strings */
-    coff_int	ifdMax;		/* number of file descriptor entries */
-    coff_int	crfd;		/* number of relative file descriptor entries */
-    coff_int	iextMax;	/* max index into external symbols */
-    coff_addr	cbLine;		/* number of bytes for line number entries */
-    coff_addr	cbLineOffset;	/* offset to start of line number entries*/
-    coff_addr	cbDnOffset;	/* offset to start dense number table */
-    coff_addr	cbPdOffset;	/* offset to procedure descriptor table */
-    coff_addr	cbSymOffset;	/* offset to start of local symbols*/
-    coff_addr	cbOptOffset;	/* offset to optimization symbol entries */
-    coff_addr	cbAuxOffset;	/* offset to start of auxillary symbol entries*/
-    coff_addr	cbSsOffset;	/* offset to start of local strings */
-    coff_addr	cbSsExtOffset;	/* offset to start of external strings */
-    coff_addr	cbFdOffset;	/* offset to file descriptor table */
-    coff_addr	cbRfdOffset;	/* offset to relative file descriptor table */
-    coff_addr	cbExtOffset;	/* offset to start of external symbol entries*/
+    coff_short  magic;          /* to verify validity of the table */
+    coff_short  vstamp;         /* version stamp */
+    coff_int    ilineMax;       /* number of line number entries */
+    coff_int    idnMax;         /* max index into dense number table */
+    coff_int    ipdMax;         /* number of procedures */
+    coff_int    isymMax;        /* number of local symbols */
+    coff_int    ioptMax;        /* max index into optimization symbol entries */
+    coff_int    iauxMax;        /* number of auxillary symbol entries */
+    coff_int    issMax;         /* max index into local strings */
+    coff_int    issExtMax;      /* max index into external strings */
+    coff_int    ifdMax;         /* number of file descriptor entries */
+    coff_int    crfd;           /* number of relative file descriptor entries */
+    coff_int    iextMax;        /* max index into external symbols */
+    coff_addr   cbLine;         /* number of bytes for line number entries */
+    coff_addr   cbLineOffset;   /* offset to start of line number entries*/
+    coff_addr   cbDnOffset;     /* offset to start dense number table */
+    coff_addr   cbPdOffset;     /* offset to procedure descriptor table */
+    coff_addr   cbSymOffset;    /* offset to start of local symbols*/
+    coff_addr   cbOptOffset;    /* offset to optimization symbol entries */
+    coff_addr   cbAuxOffset;    /* offset to start of auxillary symbol entries*/
+    coff_addr   cbSsOffset;     /* offset to start of local strings */
+    coff_addr   cbSsExtOffset;  /* offset to start of external strings */
+    coff_addr   cbFdOffset;     /* offset to file descriptor table */
+    coff_addr   cbRfdOffset;    /* offset to relative file descriptor table */
+    coff_addr   cbExtOffset;    /* offset to start of external symbol entries*/
     /* If you add machine dependent fields, add them here */
 } HDRR, *pHDRR;
 #define cbHDRR sizeof(HDRR)
@@ -138,39 +138,39 @@ typedef struct ecoff_symhdr {
  *
  * There is one of these for EVERY FILE, whether compiled with
  * full debugging symbols or not.  The name of a file should be
- * the path name given to the compiler.	 This allows the user
+ * the path name given to the compiler.  This allows the user
  * to simply specify the names of the directories where the COMPILES
  * were done, and we will be able to find their files.
  * A field whose comment starts with "R - " indicates that it will be
  * setup at runtime.
  */
 typedef struct ecoff_fdr {
-    coff_addr	adr;		/* memory address of beginning of file */
-    coff_addr	cbLineOffset;	/* byte offset from header for this file ln's */
-    coff_addr	cbLine;		/* size of lines for this file */
-    coff_addr	cbSs;		/* number of bytes in the ss */
-    coff_int	rss;		/* file name (of source, if known) */
-    coff_int	issBase;	/* file's string space */
-    coff_int	isymBase;	/* beginning of symbols */
-    coff_int	csym;		/* count file's of symbols */
-    coff_int	ilineBase;	/* file's line symbols */
-    coff_int	cline;		/* count of file's line symbols */
-    coff_int	ioptBase;	/* file's optimization entries */
-    coff_int	copt;		/* count of file's optimization entries */
-    coff_int 	ipdFirst;	/* start of procedures for this file */
-    coff_int	cpd;		/* count of procedures for this file */
-    coff_int	iauxBase;	/* file's auxiliary entries */
-    coff_int	caux;		/* count of file's auxiliary entries */
-    coff_int	rfdBase;	/* index into the file indirect table */
-    coff_int	crfd;		/* count file indirect entries */
-    unsigned lang: 5;	/* language for this file */
-    unsigned fMerge : 1;	/* whether this file can be merged */
-    unsigned fReadin : 1;	/* true if it was read in (not just created) */
+    coff_addr   adr;            /* memory address of beginning of file */
+    coff_addr   cbLineOffset;   /* byte offset from header for this file ln's */
+    coff_addr   cbLine;         /* size of lines for this file */
+    coff_addr   cbSs;           /* number of bytes in the ss */
+    coff_int    rss;            /* file name (of source, if known) */
+    coff_int    issBase;        /* file's string space */
+    coff_int    isymBase;       /* beginning of symbols */
+    coff_int    csym;           /* count file's of symbols */
+    coff_int    ilineBase;      /* file's line symbols */
+    coff_int    cline;          /* count of file's line symbols */
+    coff_int    ioptBase;       /* file's optimization entries */
+    coff_int    copt;           /* count of file's optimization entries */
+    coff_int    ipdFirst;       /* start of procedures for this file */
+    coff_int    cpd;            /* count of procedures for this file */
+    coff_int    iauxBase;       /* file's auxiliary entries */
+    coff_int    caux;           /* count of file's auxiliary entries */
+    coff_int    rfdBase;        /* index into the file indirect table */
+    coff_int    crfd;           /* count file indirect entries */
+    unsigned lang: 5;   /* language for this file */
+    unsigned fMerge : 1;        /* whether this file can be merged */
+    unsigned fReadin : 1;       /* true if it was read in (not just created) */
     unsigned fBigendian : 1;/* if set, was compiled on big endian machine */
-    /*	aux's will be in compile host's sex */
-    unsigned glevel : 2;	/* level this file was compiled with */
+    /*  aux's will be in compile host's sex */
+    unsigned glevel : 2;        /* level this file was compiled with */
     unsigned reserved : 22;  /* reserved for future use */
-    coff_uint	reserved2;
+    coff_uint   reserved2;
 } FDR, *pFDR;
 #define cbFDR sizeof(FDR)
 #define fdNil ((pFDR)0)
@@ -189,31 +189,31 @@ typedef struct ecoff_fdr {
  */
 
 typedef struct pdr {
-    coff_addr	adr;		/* memory address of start of procedure */
-    coff_addr	cbLineOffset;	/* byte offset for this procedure from the fd base */
-    coff_int	isym;		/* start of local symbol entries */
-    coff_int	iline;		/* start of line number entries*/
-    coff_uint	regmask;	/* save register mask */
-    coff_int	regoffset;	/* save register offset */
-    coff_int	iopt;		/* start of optimization symbol entries*/
-    coff_uint	fregmask;	/* save floating point register mask */
-    coff_int	fregoffset;	/* save floating point register offset */
-    coff_int	frameoffset;	/* frame size */
-    coff_int	lnLow;		/* lowest line in the procedure */
-    coff_int	lnHigh;		/* highest line in the procedure */
+    coff_addr   adr;            /* memory address of start of procedure */
+    coff_addr   cbLineOffset;   /* byte offset for this procedure from the fd base */
+    coff_int    isym;           /* start of local symbol entries */
+    coff_int    iline;          /* start of line number entries*/
+    coff_uint   regmask;        /* save register mask */
+    coff_int    regoffset;      /* save register offset */
+    coff_int    iopt;           /* start of optimization symbol entries*/
+    coff_uint   fregmask;       /* save floating point register mask */
+    coff_int    fregoffset;     /* save floating point register offset */
+    coff_int    frameoffset;    /* frame size */
+    coff_int    lnLow;          /* lowest line in the procedure */
+    coff_int    lnHigh;         /* highest line in the procedure */
     /* These fields are new for 64 bit ECOFF.  */
     unsigned gp_prologue : 8; /* byte size of GP prologue */
-    unsigned gp_used : 1;	/* true if the procedure uses GP */
-    unsigned reg_frame : 1;	/* true if register frame procedure */
-    unsigned prof : 1;	/* true if compiled with -pg */
-    unsigned reserved : 13;	/* reserved: must be zero */
-    unsigned localoff : 8;	/* offset of local variables from vfp */
-    coff_short	framereg;	/* frame pointer register */
-    coff_short	pcreg;		/* offset or reg of return pc */
+    unsigned gp_used : 1;       /* true if the procedure uses GP */
+    unsigned reg_frame : 1;     /* true if register frame procedure */
+    unsigned prof : 1;  /* true if compiled with -pg */
+    unsigned reserved : 13;     /* reserved: must be zero */
+    unsigned localoff : 8;      /* offset of local variables from vfp */
+    coff_short  framereg;       /* frame pointer register */
+    coff_short  pcreg;          /* offset or reg of return pc */
 } PDR, *pPDR;
 #define cbPDR sizeof(PDR)
 #define pdNil ((pPDR) 0)
-#define ipdNil	-1
+#define ipdNil  -1
 
 /*
  * The structure of the runtime procedure descriptor created by the loader
@@ -225,16 +225,16 @@ typedef struct pdr {
  */
 #if 0
 typedef struct runtime_pdr {
-    coff_addr	adr;		/* memory address of start of procedure */
-    coff_uint	regmask;	/* save register mask */
-    coff_int	regoffset;	/* save register offset */
-    coff_uint	fregmask;	/* save floating point register mask */
-    coff_int	fregoffset;	/* save floating point register offset */
-    coff_int	frameoffset;	/* frame size */
-    coff_ushort	framereg;	/* frame pointer register */
-    coff_ushort	pcreg;		/* offset or reg of return pc */
-    coff_int	irpss;		/* index into the runtime string table */
-    coff_uint	reserved;
+    coff_addr   adr;            /* memory address of start of procedure */
+    coff_uint   regmask;        /* save register mask */
+    coff_int    regoffset;      /* save register offset */
+    coff_uint   fregmask;       /* save floating point register mask */
+    coff_int    fregoffset;     /* save floating point register offset */
+    coff_int    frameoffset;    /* frame size */
+    coff_ushort framereg;       /* frame pointer register */
+    coff_ushort pcreg;          /* offset or reg of return pc */
+    coff_int    irpss;          /* index into the runtime string table */
+    coff_uint   reserved;
     struct exception_info *exception_info;/* pointer to exception array */
 } RPDR, *pRPDR;
 #define cbRPDR sizeof(RPDR)
@@ -253,24 +253,24 @@ typedef struct runtime_pdr {
  * the first line of a procedure and represent the first address.
  */
 
-typedef	coff_int LINER, *pLINER;
+typedef coff_int LINER, *pLINER;
 #define lineNil ((pLINER)0)
 #define cbLINER sizeof(LINER)
-#define ilineNil	-1
+#define ilineNil        -1
 
 
 
 /*
- * The Symbol Structure		(GFW, to those who Know!)
+ * The Symbol Structure         (GFW, to those who Know!)
  */
 
 typedef struct ecoff_sym {
-    coff_long	value;		/* value of symbol */
-    coff_int	iss;		/* index into String Space of name */
-    unsigned st : 6;	/* symbol type */
-    unsigned sc  : 5;	/* storage class - text, data, etc */
-    unsigned reserved : 1;	/* reserved */
-    unsigned index : 20;	/* index into sym/aux table */
+    coff_long   value;          /* value of symbol */
+    coff_int    iss;            /* index into String Space of name */
+    unsigned st : 6;    /* symbol type */
+    unsigned sc  : 5;   /* storage class - text, data, etc */
+    unsigned reserved : 1;      /* reserved */
+    unsigned index : 20;        /* index into sym/aux table */
 } SYMR, *pSYMR;
 #define symNil ((pSYMR)0)
 #define cbSYMR sizeof(SYMR)
@@ -287,22 +287,22 @@ typedef struct ecoff_sym {
 
 /* E X T E R N A L   S Y M B O L  R E C O R D
  *
- *	Same as the SYMR except it contains file context to determine where
- *	the index is.
+ *      Same as the SYMR except it contains file context to determine where
+ *      the index is.
  */
 typedef struct ecoff_extsym {
-    SYMR	asym;		/* symbol for the external */
-    unsigned jmptbl:1;	/* symbol is a jump table entry for shlibs */
-    unsigned cobol_main:1;	/* symbol is a cobol main procedure */
-    unsigned weakext:1;	/* symbol is weak external */
-    unsigned reserved:29;	/* reserved for future use */
-    coff_int ifd;		/* where the iss and index fields point into */
+    SYMR        asym;           /* symbol for the external */
+    unsigned jmptbl:1;  /* symbol is a jump table entry for shlibs */
+    unsigned cobol_main:1;      /* symbol is a cobol main procedure */
+    unsigned weakext:1; /* symbol is weak external */
+    unsigned reserved:29;       /* reserved for future use */
+    coff_int ifd;               /* where the iss and index fields point into */
 } EXTR, *pEXTR;
 #define extNil ((pEXTR)0)
 #define cbEXTR sizeof(EXTR)
 
 
-/* A U X I L L A R Y   T Y P E	 I N F O R M A T I O N */
+/* A U X I L L A R Y   T Y P E   I N F O R M A T I O N */
 
 /*
  * Type Information Record
@@ -310,12 +310,12 @@ typedef struct ecoff_extsym {
 typedef struct {
     unsigned fBitfield : 1; /* set if bit width is specified */
     unsigned continued : 1; /* indicates additional TQ info in next AUX */
-    unsigned bt  : 6;	/* basic type */
+    unsigned bt  : 6;   /* basic type */
     unsigned tq4 : 4;
     unsigned tq5 : 4;
     /* ---- 16 bit boundary ---- */
     unsigned tq0 : 4;
-    unsigned tq1 : 4;	/* 6 type qualifiers - tqPtr, etc. */
+    unsigned tq1 : 4;   /* 6 type qualifiers - tqPtr, etc. */
     unsigned tq2 : 4;
     unsigned tq3 : 4;
 } TIR, *pTIR;
@@ -327,22 +327,22 @@ typedef struct {
  * Relative symbol record
  *
  * If the rfd field is 4095, the index field indexes into the global symbol
- *	table.
+ *      table.
  */
 
 typedef struct {
-    unsigned	rfd : 12;    /* index into the file indirect table */
-    unsigned	index : 20; /* index int sym/aux/iss tables */
+    unsigned    rfd : 12;    /* index into the file indirect table */
+    unsigned    index : 20; /* index int sym/aux/iss tables */
 } RNDXR, *pRNDXR;
 #define cbRNDXR sizeof(RNDXR)
 #define rndxNil ((pRNDXR)0)
 
 /* dense numbers or sometimes called block numbers are stored in this type,
- *	a rfd of 0xffffffff is an index into the global table.
+ *      a rfd of 0xffffffff is an index into the global table.
  */
 typedef struct {
-    coff_uint	rfd;    /* index into the file table */
-    coff_uint	index; 	/* index int sym/aux/iss tables */
+    coff_uint   rfd;    /* index into the file table */
+    coff_uint   index;  /* index int sym/aux/iss tables */
 } DNR, *pDNR;
 #define cbDNR sizeof(DNR)
 #define dnNil ((pDNR)0)
@@ -353,36 +353,36 @@ typedef struct {
  * Auxillary information occurs only if needed.
  * It ALWAYS occurs in this order when present.
 
-            isymMac		used by stProc only
-            TIR			type info
-            TIR			additional TQ info (if first TIR was not enough)
-            rndx		if (bt == btStruct,btUnion,btEnum,btSet,btRange,
+            isymMac             used by stProc only
+            TIR                 type info
+            TIR                 additional TQ info (if first TIR was not enough)
+            rndx                if (bt == btStruct,btUnion,btEnum,btSet,btRange,
                                     btTypedef):
                                     rsym.index == iaux for btSet or btRange
                                     else rsym.index == isym
-            dimLow		btRange, btSet
-            dimMac		btRange, btSet
-            rndx0		As many as there are tq arrays
+            dimLow              btRange, btSet
+            dimMac              btRange, btSet
+            rndx0               As many as there are tq arrays
             dimLow0
             dimHigh0
             ...
             rndxMax-1
             dimLowMax-1
             dimHighMax-1
-            width in bits	if (bit field), width in bits.
+            width in bits       if (bit field), width in bits.
  */
 #define cAuxMax (6 + (idimMax*3))
 
 /* a union of all possible info in the AUX universe */
 typedef union {
-    TIR	ti;		/* type information record */
-    RNDXR	rndx;		/* relative index into symbol table */
-    coff_int	dnLow;		/* low dimension */
-    coff_int	dnHigh;		/* high dimension */
-    coff_int	isym;		/* symbol table index (end of proc) */
-    coff_int	iss;		/* index into string space (not used) */
-    coff_int	width;		/* width for non-default sized struc fields */
-    coff_int	count;		/* count of ranges for variant arm */
+    TIR ti;             /* type information record */
+    RNDXR       rndx;           /* relative index into symbol table */
+    coff_int    dnLow;          /* low dimension */
+    coff_int    dnHigh;         /* high dimension */
+    coff_int    isym;           /* symbol table index (end of proc) */
+    coff_int    iss;            /* index into string space (not used) */
+    coff_int    width;          /* width for non-default sized struc fields */
+    coff_int    count;          /* count of ranges for variant arm */
 } AUXU, *pAUXU;
 #define cbAUXU sizeof(AUXU)
 #define auxNil ((pAUXU)0)
@@ -401,12 +401,12 @@ typedef union {
  */
 
 typedef struct {
-    unsigned ot: 8;		/* optimization type */
-    unsigned value: 24;	/* address where we are moving it to */
-    RNDXR	rndx;		/* points to a symbol or opt entry */
-    coff_ulong	offset;	/* relative offset this occured */
+    unsigned ot: 8;             /* optimization type */
+    unsigned value: 24; /* address where we are moving it to */
+    RNDXR       rndx;           /* points to a symbol or opt entry */
+    coff_ulong  offset; /* relative offset this occured */
 } OPTR, *pOPTR;
-#define optNil	((pOPTR) 0)
+#define optNil  ((pOPTR) 0)
 #define cbOPTR sizeof(OPTR)
 #define ioptNil -1
 
@@ -414,15 +414,15 @@ typedef struct {
  * File Indirect
  *
  * When a symbol is referenced across files the following procedure is used:
- *	1) use the file index to get the File indirect entry.
- *	2) use the file indirect entry to get the File descriptor.
- *	3) add the sym index to the base of that file's sym table
+ *      1) use the file index to get the File indirect entry.
+ *      2) use the file indirect entry to get the File descriptor.
+ *      3) add the sym index to the base of that file's sym table
  *
  */
 
 typedef coff_long RFDT, *pRFDT;
 #define cbRFDT sizeof(RFDT)
-#define rfdNil	-1
+#define rfdNil  -1
 
 /*
  * The file indirect table in the mips loader is known as an array of FITs.
@@ -430,9 +430,9 @@ typedef coff_long RFDT, *pRFDT;
  * these tables are merged.  Note this is only a name change.
  */
 typedef coff_int FIT, *pFIT;
-#define cbFIT	sizeof(FIT)
-#define ifiNil	-1
-#define fiNil	((pFIT) 0)
+#define cbFIT   sizeof(FIT)
+#define ifiNil  -1
+#define fiNil   ((pFIT) 0)
 
 #ifdef _LANGUAGE_PASCAL
 #define ifdNil -1
@@ -448,18 +448,18 @@ typedef coff_int FIT, *pFIT;
 #define ioptNil -1
 #define rfdNil -1
 #define ifiNil -1
-#endif	/* _LANGUAGE_PASCAL */
+#endif  /* _LANGUAGE_PASCAL */
 
 
 /* Dense numbers
  *
  * Rather than use file index, symbol index pairs to represent symbols
- *	and globals, we use dense number so that they can be easily embeded
- *	in intermediate code and the programs that process them can
- *	use direct access tabls instead of hash table (which would be
- *	necesary otherwise because of the sparse name space caused by
- *	file index, symbol index pairs. Dense number are represented
- *	by RNDXRs.
+ *      and globals, we use dense number so that they can be easily embeded
+ *      in intermediate code and the programs that process them can
+ *      use direct access tabls instead of hash table (which would be
+ *      necesary otherwise because of the sparse name space caused by
+ *      file index, symbol index pairs. Dense number are represented
+ *      by RNDXRs.
  */
 
 /*
@@ -467,7 +467,7 @@ typedef coff_int FIT, *pFIT;
  * a function of the "st". (scD/B == scData OR scBss)
  *
  * Note: the value "isymMac" is used by symbols that have the concept
- * of enclosing a block of related information.	 This value is the
+ * of enclosing a block of related information.  This value is the
  * isym of the first symbol AFTER the end associated with the primary
  * symbol. For example if a procedure was at isym==90 and had an
  * isymMac==155, the associated end would be at isym==154, and the
@@ -477,42 +477,42 @@ typedef coff_int FIT, *pFIT;
  * isym of the primary symbol that started the block.
  *
 
-ST		SC	VALUE		INDEX
---------	------	--------	------
-stFile		scText	address		isymMac
-stLabel		scText	address		---
-stGlobal	scD/B	address		iaux
-stStatic	scD/B	address		iaux
-stParam		scAbs	offset		iaux
-stLocal		scAbs	offset		iaux
-stProc		scText	address		iaux	(isymMac is first AUX)
-stStaticProc	scText	address		iaux	(isymMac is first AUX)
-
-stMember	scNil	ordinal		---	(if member of enum)
+ST              SC      VALUE           INDEX
+--------        ------  --------        ------
+stFile          scText  address         isymMac
+stLabel         scText  address         ---
+stGlobal        scD/B   address         iaux
+stStatic        scD/B   address         iaux
+stParam         scAbs   offset          iaux
+stLocal         scAbs   offset          iaux
+stProc          scText  address         iaux    (isymMac is first AUX)
+stStaticProc    scText  address         iaux    (isymMac is first AUX)
+
+stMember        scNil   ordinal         ---     (if member of enum)
         (mipsread thinks the case below has a bit, not byte, offset.)
-stMember	scNil	byte offset	iaux	(if member of struct/union)
-stMember	scBits	bit offset	iaux	(bit field spec)
+stMember        scNil   byte offset     iaux    (if member of struct/union)
+stMember        scBits  bit offset      iaux    (bit field spec)
 
-stBlock		scText	address		isymMac (text block)
+stBlock         scText  address         isymMac (text block)
         (the code seems to think that rather than scNil, we see scInfo for
          the two cases below.)
-stBlock		scNil	cb		isymMac (struct/union member define)
-stBlock		scNil	cMembers	isymMac (enum member define)
+stBlock         scNil   cb              isymMac (struct/union member define)
+stBlock         scNil   cMembers        isymMac (enum member define)
 
         (New types added by SGI to simplify things:)
-stStruct	scInfo	cb		isymMac (struct type define)
-stUnion		scInfo	cb		isymMac (union  type define)
-stEnum		scInfo	cMembers	isymMac (enum   type define)
+stStruct        scInfo  cb              isymMac (struct type define)
+stUnion         scInfo  cb              isymMac (union  type define)
+stEnum          scInfo  cMembers        isymMac (enum   type define)
 
-stEnd		scText	address		isymStart
-stEnd		scNil	-------		isymStart (struct/union/enum)
+stEnd           scText  address         isymStart
+stEnd           scNil   -------         isymStart (struct/union/enum)
 
-stTypedef	scNil	-------		iaux
-stRegReloc	sc???	value		old register number
-stForward	sc???	new address	isym to original symbol
+stTypedef       scNil   -------         iaux
+stRegReloc      sc???   value           old register number
+stForward       sc???   new address     isym to original symbol
 
-stConstant	scInfo	value		--- (scalar)
-stConstant	scInfo	iss		--- (complex, e.g. string)
+stConstant      scInfo  value           --- (scalar)
+stConstant      scInfo  iss             --- (complex, e.g. string)
 
  *
  */
diff --git a/src/base/loader/coff_symconst.h b/src/base/loader/coff_symconst.h
index f383c19e6..18529113f 100644
--- a/src/base/loader/coff_symconst.h
+++ b/src/base/loader/coff_symconst.h
@@ -59,30 +59,30 @@
  */
 
 /* glevels for field in FDR */
-#define GLEVEL_0	2
-#define GLEVEL_1	1
-#define GLEVEL_2	0	/* for upward compat reasons. */
-#define GLEVEL_3	3
+#define GLEVEL_0        2
+#define GLEVEL_1        1
+#define GLEVEL_2        0       /* for upward compat reasons. */
+#define GLEVEL_3        3
 
 /* magic number fo symheader */
-#define magicSym	0x7009
+#define magicSym        0x7009
 /* The Alpha uses this value instead, for some reason.  */
-#define magicSym2	0x1992
+#define magicSym2       0x1992
 
 /* Language codes */
-#define langC		0
-#define langPascal	1
-#define langFortran	2
-#define	langAssembler	3	/* one Assembley inst might map to many mach */
-#define langMachine	4
-#define langNil		5
-#define langAda		6
-#define langPl1		7
-#define langCobol	8
-#define langStdc	9	/* FIXME: Collides with SGI langCplusplus */
-#define langCplusplus	9	/* FIXME: Collides with langStdc */
-#define langCplusplusV2	10	/* SGI addition */
-#define langMax		11	/* maximun allowed 32 -- 5 bits */
+#define langC           0
+#define langPascal      1
+#define langFortran     2
+#define langAssembler   3       /* one Assembley inst might map to many mach */
+#define langMachine     4
+#define langNil         5
+#define langAda         6
+#define langPl1         7
+#define langCobol       8
+#define langStdc        9       /* FIXME: Collides with SGI langCplusplus */
+#define langCplusplus   9       /* FIXME: Collides with langStdc */
+#define langCplusplusV2 10      /* SGI addition */
+#define langMax         11      /* maximun allowed 32 -- 5 bits */
 
 /* The following are value definitions for the fields in the SYMR */
 
@@ -90,111 +90,111 @@
  * Storage Classes
  */
 
-#define scNil		0
-#define scText		1	/* text symbol */
-#define scData		2	/* initialized data symbol */
-#define scBss		3	/* un-initialized data symbol */
-#define scRegister	4	/* value of symbol is register number */
-#define scAbs		5	/* value of symbol is absolute */
-#define scUndefined	6	/* who knows? */
-#define scCdbLocal	7	/* variable's value is IN se->va.?? */
-#define scBits		8	/* this is a bit field */
-#define scCdbSystem	9	/* variable's value is IN CDB's address space */
-#define scDbx		9	/* overlap dbx internal use */
-#define scRegImage	10	/* register value saved on stack */
-#define scInfo		11	/* symbol contains debugger information */
-#define scUserStruct	12	/* address in struct user for current process */
-#define scSData		13	/* load time only small data */
-#define scSBss		14	/* load time only small common */
-#define scRData		15	/* load time only read only data */
-#define scVar		16	/* Var parameter (fortran,pascal) */
-#define scCommon	17	/* common variable */
-#define scSCommon	18	/* small common */
-#define scVarRegister	19	/* Var parameter in a register */
-#define scVariant	20	/* Variant record */
-#define scSUndefined	21	/* small undefined(external) data */
-#define scInit		22	/* .init section symbol */
-#define scBasedVar	23	/* Fortran or PL/1 ptr based var */
+#define scNil           0
+#define scText          1       /* text symbol */
+#define scData          2       /* initialized data symbol */
+#define scBss           3       /* un-initialized data symbol */
+#define scRegister      4       /* value of symbol is register number */
+#define scAbs           5       /* value of symbol is absolute */
+#define scUndefined     6       /* who knows? */
+#define scCdbLocal      7       /* variable's value is IN se->va.?? */
+#define scBits          8       /* this is a bit field */
+#define scCdbSystem     9       /* variable's value is IN CDB's address space */
+#define scDbx           9       /* overlap dbx internal use */
+#define scRegImage      10      /* register value saved on stack */
+#define scInfo          11      /* symbol contains debugger information */
+#define scUserStruct    12      /* address in struct user for current process */
+#define scSData         13      /* load time only small data */
+#define scSBss          14      /* load time only small common */
+#define scRData         15      /* load time only read only data */
+#define scVar           16      /* Var parameter (fortran,pascal) */
+#define scCommon        17      /* common variable */
+#define scSCommon       18      /* small common */
+#define scVarRegister   19      /* Var parameter in a register */
+#define scVariant       20      /* Variant record */
+#define scSUndefined    21      /* small undefined(external) data */
+#define scInit          22      /* .init section symbol */
+#define scBasedVar      23      /* Fortran or PL/1 ptr based var */
 #define scXData         24      /* exception handling data */
 #define scPData         25      /* Procedure section */
 #define scFini          26      /* .fini section */
-#define scRConst	27	/* .rconst section */
-#define scMax		32
+#define scRConst        27      /* .rconst section */
+#define scMax           32
 
 
 /*
  *   Symbol Types
  */
 
-#define stNil		0	/* Nuthin' special */
-#define stGlobal	1	/* external symbol */
-#define stStatic	2	/* static */
-#define stParam		3	/* procedure argument */
-#define stLocal		4	/* local variable */
-#define stLabel		5	/* label */
-#define stProc		6	/*     "      "	 Procedure */
-#define stBlock		7	/* beginnning of block */
-#define stEnd		8	/* end (of anything) */
-#define stMember	9	/* member (of anything	- struct/union/enum */
-#define stTypedef	10	/* type definition */
-#define stFile		11	/* file name */
-#define stRegReloc	12	/* register relocation */
-#define stForward	13	/* forwarding address */
-#define stStaticProc	14	/* load time only static procs */
-#define stConstant	15	/* const */
-#define stStaParam	16	/* Fortran static parameters */
+#define stNil           0       /* Nuthin' special */
+#define stGlobal        1       /* external symbol */
+#define stStatic        2       /* static */
+#define stParam         3       /* procedure argument */
+#define stLocal         4       /* local variable */
+#define stLabel         5       /* label */
+#define stProc          6       /*     "      "  Procedure */
+#define stBlock         7       /* beginnning of block */
+#define stEnd           8       /* end (of anything) */
+#define stMember        9       /* member (of anything  - struct/union/enum */
+#define stTypedef       10      /* type definition */
+#define stFile          11      /* file name */
+#define stRegReloc      12      /* register relocation */
+#define stForward       13      /* forwarding address */
+#define stStaticProc    14      /* load time only static procs */
+#define stConstant      15      /* const */
+#define stStaParam      16      /* Fortran static parameters */
     /* These new symbol types have been recently added to SGI machines. */
-#define stStruct	26	/* Beginning of block defining a struct type */
-#define stUnion		27	/* Beginning of block defining a union type */
-#define stEnum		28	/* Beginning of block defining an enum type */
-#define stIndirect	34	/* Indirect type specification */
+#define stStruct        26      /* Beginning of block defining a struct type */
+#define stUnion         27      /* Beginning of block defining a union type */
+#define stEnum          28      /* Beginning of block defining an enum type */
+#define stIndirect      34      /* Indirect type specification */
     /* Pseudo-symbols - internal to debugger */
-#define stStr		60	/* string */
-#define stNumber	61	/* pure number (ie. 4 NOR 2+2) */
-#define stExpr		62	/* 2+2 vs. 4 */
-#define stType		63	/* post-coersion SER */
-#define stMax		64
+#define stStr           60      /* string */
+#define stNumber        61      /* pure number (ie. 4 NOR 2+2) */
+#define stExpr          62      /* 2+2 vs. 4 */
+#define stType          63      /* post-coersion SER */
+#define stMax           64
 
 /* definitions for fields in TIR */
 
 /* type qualifiers for ti.tq0 -> ti.(itqMax-1) */
-#define tqNil	0	/* bt is what you see */
-#define tqPtr	1	/* pointer */
-#define tqProc	2	/* procedure */
-#define tqArray 3	/* duh */
-#define tqFar	4	/* longer addressing - 8086/8 land */
-#define tqVol	5	/* volatile */
-#define tqConst 6	/* const */
-#define tqMax	8
+#define tqNil   0       /* bt is what you see */
+#define tqPtr   1       /* pointer */
+#define tqProc  2       /* procedure */
+#define tqArray 3       /* duh */
+#define tqFar   4       /* longer addressing - 8086/8 land */
+#define tqVol   5       /* volatile */
+#define tqConst 6       /* const */
+#define tqMax   8
 
 /* basic types as seen in ti.bt */
-#define btNil		0	/* undefined (also, enum members) */
-#define btAdr		1	/* address - integer same size as pointer */
-#define btChar		2	/* character */
-#define btUChar		3	/* unsigned character */
-#define btShort		4	/* short */
-#define btUShort	5	/* unsigned short */
-#define btInt		6	/* int */
-#define btUInt		7	/* unsigned int */
-#define btLong		8	/* long */
-#define btULong		9	/* unsigned long */
-#define btFloat		10	/* float (real) */
-#define btDouble	11	/* Double (real) */
-#define btStruct	12	/* Structure (Record) */
-#define btUnion		13	/* Union (variant) */
-#define btEnum		14	/* Enumerated */
-#define btTypedef	15	/* defined via a typedef, isymRef points */
-#define btRange		16	/* subrange of int */
-#define btSet		17	/* pascal sets */
-#define btComplex	18	/* fortran complex */
-#define btDComplex	19	/* fortran double complex */
-#define btIndirect	20	/* forward or unnamed typedef */
-#define btFixedDec	21	/* Fixed Decimal */
-#define btFloatDec	22	/* Float Decimal */
-#define btString	23	/* Varying Length Character String */
-#define btBit		24	/* Aligned Bit String */
-#define btPicture	25	/* Picture */
-#define btVoid		26	/* void */
-#define btLongLong	27	/* long long */
-#define btULongLong	28	/* unsigned long long */
-#define btMax		64
+#define btNil           0       /* undefined (also, enum members) */
+#define btAdr           1       /* address - integer same size as pointer */
+#define btChar          2       /* character */
+#define btUChar         3       /* unsigned character */
+#define btShort         4       /* short */
+#define btUShort        5       /* unsigned short */
+#define btInt           6       /* int */
+#define btUInt          7       /* unsigned int */
+#define btLong          8       /* long */
+#define btULong         9       /* unsigned long */
+#define btFloat         10      /* float (real) */
+#define btDouble        11      /* Double (real) */
+#define btStruct        12      /* Structure (Record) */
+#define btUnion         13      /* Union (variant) */
+#define btEnum          14      /* Enumerated */
+#define btTypedef       15      /* defined via a typedef, isymRef points */
+#define btRange         16      /* subrange of int */
+#define btSet           17      /* pascal sets */
+#define btComplex       18      /* fortran complex */
+#define btDComplex      19      /* fortran double complex */
+#define btIndirect      20      /* forward or unnamed typedef */
+#define btFixedDec      21      /* Fixed Decimal */
+#define btFloatDec      22      /* Float Decimal */
+#define btString        23      /* Varying Length Character String */
+#define btBit           24      /* Aligned Bit String */
+#define btPicture       25      /* Picture */
+#define btVoid          26      /* void */
+#define btLongLong      27      /* long long */
+#define btULongLong     28      /* unsigned long long */
+#define btMax           64
diff --git a/src/base/loader/ecoff_object.cc b/src/base/loader/ecoff_object.cc
index a5a0ad9a4..d1719f1c6 100644
--- a/src/base/loader/ecoff_object.cc
+++ b/src/base/loader/ecoff_object.cc
@@ -34,7 +34,7 @@
 #include "base/misc.hh"
 #include "base/loader/symtab.hh"
 
-#include "base/trace.hh"	// for DPRINTF
+#include "base/trace.hh"        // for DPRINTF
 
 #include "base/loader/exec_ecoff.h"
 #include "base/loader/coff_sym.h"
diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc
index 8e41ffd16..16fc698dd 100644
--- a/src/base/loader/elf_object.cc
+++ b/src/base/loader/elf_object.cc
@@ -29,6 +29,7 @@
  *          Ali Saidi
  */
 
+#include <cassert>
 #include <string>
 
 #include "gelf.h"
@@ -36,7 +37,7 @@
 #include "base/loader/elf_object.hh"
 #include "base/loader/symtab.hh"
 #include "base/misc.hh"
-#include "base/trace.hh"	// for DPRINTF
+#include "base/trace.hh"        // for DPRINTF
 #include "sim/byteswap.hh"
 
 using namespace std;
@@ -79,13 +80,19 @@ ElfObject::tryFile(const string &fname, int fd, size_t len, uint8_t *data)
             arch = ObjectFile::SPARC32;
         } else if (ehdr.e_machine == EM_MIPS
                 && ehdr.e_ident[EI_CLASS] == ELFCLASS32) {
-            arch = ObjectFile::Mips;
+            if (ehdr.e_ident[EI_DATA] == ELFDATA2LSB) {
+                arch = ObjectFile::Mips;
+            } else {
+                fatal("The binary you're trying to load is compiled for big "
+                        "endian MIPS. M5\nonly supports little endian MIPS. "
+                        "Please recompile your binary.\n");
+            }
         } else if (ehdr.e_machine == EM_X86_64 &&
                 ehdr.e_ident[EI_CLASS] == ELFCLASS64) {
-            //In the future, we might want to differentiate between 32 bit
-            //and 64 bit x86 processes in case there are differences in their
-            //initial stack frame.
-            arch = ObjectFile::X86;
+            arch = ObjectFile::X86_64;
+        } else if (ehdr.e_machine == EM_386 &&
+                ehdr.e_ident[EI_CLASS] == ELFCLASS32) {
+            arch = ObjectFile::I386;
         } else if (ehdr.e_ident[EI_CLASS] == ELFCLASS64) {
             arch = ObjectFile::Alpha;
         } else if (ehdr.e_machine == EM_ARM) {
@@ -284,6 +291,8 @@ ElfObject::ElfObject(const string &_filename, int _fd,
             data.size = phdr.p_filesz;
             data.fileImage = fileData + phdr.p_offset;
         } else {
+            // If it's none of the above but is loadable, 
+            // load the filesize worth of data
             Segment extra;
             extra.baseAddr = phdr.p_paddr;
             extra.size = phdr.p_filesz;
diff --git a/src/base/loader/hex_file.cc b/src/base/loader/hex_file.cc
index 1855ebe0c..61d6c8009 100755
--- a/src/base/loader/hex_file.cc
+++ b/src/base/loader/hex_file.cc
@@ -28,134 +28,111 @@
  * Authors: Jaidev Patwardhan
  */
 
+#include <cctype>
+#include <cstdio>
 #include <list>
 #include <string>
 
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <unistd.h>
-
 #include "base/cprintf.hh"
 #include "base/loader/hex_file.hh"
 #include "base/loader/symtab.hh"
-
-
 #include "mem/translating_port.hh"
 
 using namespace std;
-/* Load a Hex File into memory.
-   Currently only used with MIPS BARE_IRON mode.
-   A hex file consists of [Address Data] tuples that get directly loaded into
-   physical memory. The address specified is a word address (i.e., to get the byte address, shift left by 2)
-   The data is a full 32-bit hex value.
+/*
+ * Load a Hex File into memory. Currently only used with MIPS
+ * BARE_IRON mode. A hex file consists of [Address Data] tuples that
+ * get directly loaded into physical memory. The address specified is
+ * a word address (i.e., to get the byte address, shift left by 2) The
+ * data is a full 32-bit hex value.
 */
 HexFile::HexFile(const string _filename)
     : filename(_filename)
 {
-  fp = fopen(filename.c_str(),"r");
-  if(fp == NULL)
-    {
-      panic("Unable to open %s\n",filename.c_str());
-    }
-
+    fp = fopen(filename.c_str(), "r");
+    if (fp == NULL)
+        panic("Unable to open %s\n", filename.c_str());
 }
 
 HexFile::~HexFile()
 {
 }
 
-
 bool
-HexFile::loadSections(Port *memPort, Addr addrMask)
+HexFile::loadSections(Port *memPort)
 {
-  char Line[64];
-  Addr MemAddr;
-  uint32_t Data;
-  while(!feof(fp))
-    {
-      fgets(Line,64,fp);
-      parseLine(Line,&MemAddr,&Data);
-      //      printf("Hex:%u\n",Data);
-
-      if(MemAddr != 0)
-        {
-          // Now, write to memory
-          memPort->writeBlob(MemAddr<<2,(uint8_t *)&Data,sizeof(Data));
+    char Line[64];
+    Addr MemAddr;
+    uint32_t Data;
+    while (!feof(fp)) {
+        char *ret = fgets(Line, sizeof(Line), fp);
+        if (!ret)
+            panic("malformed file");
+        parseLine(Line, &MemAddr, &Data);
+        if (MemAddr != 0) {
+            // Now, write to memory
+            memPort->writeBlob(MemAddr << 2, (uint8_t *)&Data, sizeof(Data));
         }
     }
     return true;
 }
-void HexFile::parseLine(char *Str,Addr *A, uint32_t *D)
-{
-  int i=0;
-  bool Flag = false;
-  *A = 0;
-  *D = 0;
-  int Digit = 0;
-  unsigned Number = 0;
-  /* Skip white spaces */
-  while(Str[i] != '\0' && Str[i]==' ')
-    i++;
 
-  /* Ok, we're at some character...process things */
-  while(Str[i] != '\0')
-    {
-      if(Str[i]>='0' && Str[i]<='9')
-        {
-          Digit=Str[i]-'0';
-        }
-      else if(Str[i]>='a' && Str[i]<='f')
-        {
-          Digit=Str[i]-'a'+10;
-        }
-      else if(Str[i]>='A' && Str[i]<='F')
-        {
+void
+HexFile::parseLine(char *Str, Addr *A, uint32_t *D)
+{
+    int i = 0;
+    bool Flag = false;
+    *A = 0;
+    *D = 0;
+    int Digit = 0;
+    unsigned Number = 0;
+
+    /* Skip white spaces */
+    while (Str[i] != '\0' && Str[i]==' ')
+        i++;
+
+    /* Ok, we're at some character...process things */
+    while (Str[i] != '\0') {
+        if (Str[i] >= '0' && Str[i] <= '9') {
+            Digit = Str[i] - '0';
+        } else if (Str[i] >= 'a' && Str[i] <= 'f') {
+            Digit = Str[i] - 'a' + 10;
+        } else if (Str[i] >= 'A' && Str[i] <= 'F') {
           Digit=Str[i]-'A'+10;
-        }
-      else if(Str[i] == ' ' || Str[i]=='\n')
-        {
-          if(Number == 0)
-            return;
-          if(Flag == false)
-            {
-              *A = Number;
-              Number = 0;
-              Flag = true;
-            }
-          else
-            {
-              *D = Number;
-              return;
+        } else if (Str[i] == ' ' || Str[i] == '\n') {
+            if (Number == 0)
+                return;
+            if (Flag == false) {
+                *A = Number;
+                Number = 0;
+                Flag = true;
+            } else {
+                *D = Number;
+                return;
             }
+        } else {
+            // Ok, we've encountered a non-hex character, cannot be a
+            // valid line, skip and return 0's
+            *A = 0;
+            *D = 0;
+            return;
         }
-      else
-        {
-          // Ok, we've encountered a non-hex character, cannot be a valid line, skip and return 0's
-          *A = 0;
-          *D = 0;
-          return;
-        }
-      Number<<=4;
-      Number+=Digit;
-      i++;
 
+        Number <<= 4;
+        Number += Digit;
+        i++;
     }
-  if(Flag != true)
-    {
-      *A = 0;
-      *D = 0;
-    }
-  else
-    *D = Number;
 
+    if (Flag != true) {
+        *A = 0;
+        *D = 0;
+    } else {
+        *D = Number;
+    }
 }
 
-
-
 void
 HexFile::close()
 {
-  fclose(fp);
+    fclose(fp);
 }
diff --git a/src/base/loader/hex_file.hh b/src/base/loader/hex_file.hh
index 1dbfd034f..40483e684 100755
--- a/src/base/loader/hex_file.hh
+++ b/src/base/loader/hex_file.hh
@@ -28,50 +28,31 @@
  * Authors: Jaidev Patwardhan
  */
 
-#ifndef __HEX_FILE_HH__
-#define __HEX_FILE_HH__
+#ifndef __BASE_LOADER_HEX_FILE_HH__
+#define __BASE_LOADER_HEX_FILE_HH__
 
+#include <cstdio>
 #include <limits>
 #include <string>
 
-#include "sim/host.hh"	// for Addr
-#include <fstream>
+#include "sim/host.hh"  // for Addr
 
 class Port;
 
 class HexFile
 {
-  public:
-
-
   protected:
     const std::string filename;
     FILE *fp;
 
+    void parseLine(char *, Addr *, uint32_t *);
+
   public:
-    virtual ~HexFile();
     HexFile(const std::string _filename);
+    virtual ~HexFile();
 
     void close();
-
-    bool loadSections(Port *memPort, Addr addrMask =
-            std::numeric_limits<Addr>::max());
-
-  protected:
-
-  typedef struct {
-    Addr MemAddr;
-    uint32_t Data;
-  } HexLine;
-
-    Addr entry;
-    Addr globalPtr;
-
-  public:
-    void parseLine(char *,Addr *,uint32_t *);
-    Addr entryPoint() const { return entry; }
-    Addr globalPointer() const { return globalPtr; }
-
+    bool loadSections(Port *memPort);
 };
 
-#endif // __HEX_FILE_HH__
+#endif // __BASE_LOADER_HEX_FILE_HH__
diff --git a/src/base/loader/object_file.hh b/src/base/loader/object_file.hh
index 7f2bef0bf..d363cde84 100644
--- 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 "sim/host.hh"  // for Addr
 
 class Port;
 class SymbolTable;
@@ -50,7 +50,8 @@ class ObjectFile
         SPARC64,
         SPARC32,
         Mips,
-        X86,
+        X86_64,
+        I386,
         Arm
     };
 
diff --git a/src/base/loader/symtab.hh b/src/base/loader/symtab.hh
index 184c0a996..cc1dc368f 100644
--- a/src/base/loader/symtab.hh
+++ b/src/base/loader/symtab.hh
@@ -34,8 +34,9 @@
 
 #include <iosfwd>
 #include <map>
+#include <string>
 
-#include "sim/host.hh"	// for Addr
+#include "sim/host.hh"  // for Addr
 
 class Checkpoint;
 class SymbolTable