derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc: Appease gcc 5.1 without moving GDB_REG_BYTES

Browse Source 
This patch rolls back the move of the GDB_REG_BYTES constant, and
instead adds M5_VAR_USED.
This commit is contained in:
Andreas Hansson
2015-04-24 03:30:08 -04:00
parent 936768c8f4
commit 179787f31f
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/arch/arm/remote_gdb.hh
View File

@@ -76,6 +76,10 @@ enum {
GDB64_NUMREGS = 98
};
const int GDB_REG_BYTES M5_VAR_USED =
std::max(GDB64_NUMREGS * sizeof(uint64_t),
GDB32_NUMREGS * sizeof(uint32_t));
class RemoteGDB : public BaseRemoteGDB
{
protected:
@@ -86,9 +90,6 @@ class RemoteGDB : public BaseRemoteGDB
void setregs();
public:
const int GDB_REG_BYTES = std::max(GDB64_NUMREGS * sizeof(uint64_t),
GDB32_NUMREGS * sizeof(uint32_t));
RemoteGDB(System *_system, ThreadContext *tc);
};
} // namespace ArmISA

8
src/arch/x86/remote_gdb.hh
View File

@@ -111,10 +111,6 @@ class RemoteGDB : public BaseRemoteGDB
GDB64_NUMREGS = (GDB64_GS_32 + 1) / 2 + 1
};
const int GDB_REG_BYTES =
std::max(RemoteGDB::GDB32_NUMREGS * sizeof(uint32_t),
RemoteGDB::GDB64_NUMREGS * sizeof(uint64_t));
RemoteGDB(System *system, ThreadContext *context);
bool acc(Addr addr, size_t len);
@@ -126,6 +122,10 @@ class RemoteGDB : public BaseRemoteGDB
bool checkBpLen(size_t len) { return len == 1; }
};
const int GDB_REG_BYTES M5_VAR_USED =
std::max(RemoteGDB::GDB32_NUMREGS * sizeof(uint32_t),
RemoteGDB::GDB64_NUMREGS * sizeof(uint64_t));
}
#endif // __ARCH_X86_REMOTEGDB_HH__