31,32c31,32
< #ifndef __HEX_FILE_HH__
< #define __HEX_FILE_HH__
---
> #ifndef __BASE_LOADER_HEX_FILE_HH__
> #define __BASE_LOADER_HEX_FILE_HH__
33a34
> #include <cstdio>
38d38
< #include <fstream>
44,46d43
< public:
<
<
50a48,49
> void parseLine(char *, Addr *, uint32_t *);
>
52d50
< virtual ~HexFile();
53a52
> virtual ~HexFile();
56,74c55
<
< 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);
77c58
< #endif // __HEX_FILE_HH__
---
> #endif // __BASE_LOADER_HEX_FILE_HH__