changeset df2aa91dba5b in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=df2aa91dba5b
description:
misc: Appease gcc 5.1 without moving GDB_REG_BYTES
This patch rolls back the move of the GDB_REG_BYTES constant, and
instead adds M5_VAR_USED.
diffstat:
src/arch/arm/remote_gdb.hh | 7 ++++---
src/arch/x86/remote_gdb.hh | 8 ++++----
2 files changed, 8 insertions(+), 7 deletions(-)
diffs (49 lines):
diff -r a91eb7b4a442 -r df2aa91dba5b src/arch/arm/remote_gdb.hh
--- a/src/arch/arm/remote_gdb.hh Thu Apr 23 13:40:18 2015 -0700
+++ b/src/arch/arm/remote_gdb.hh Fri Apr 24 03:30:08 2015 -0400
@@ -76,6 +76,10 @@
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 @@
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
diff -r a91eb7b4a442 -r df2aa91dba5b src/arch/x86/remote_gdb.hh
--- a/src/arch/x86/remote_gdb.hh Thu Apr 23 13:40:18 2015 -0700
+++ b/src/arch/x86/remote_gdb.hh Fri Apr 24 03:30:08 2015 -0400
@@ -111,10 +111,6 @@
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 @@
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__
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
