From 13f3bd419aac663184cb8ae3e4ff8bfaac1a4c8c Mon Sep 17 00:00:00 2001 From: Arnabjyoti Kalita Date: Fri, 23 May 2025 16:45:37 -0400 Subject: [PATCH 1/2] Fix compilation errors with g++-11.4.0 --- src/bp/cbp_tagescl_64k.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bp/cbp_tagescl_64k.h b/src/bp/cbp_tagescl_64k.h index 69805d1ed..294b4bbb2 100644 --- a/src/bp/cbp_tagescl_64k.h +++ b/src/bp/cbp_tagescl_64k.h @@ -293,12 +293,12 @@ struct SpeculativeStatesBase { void init() { ptghist = 0; phist = 0; - memset(ch_i, 0, sizeof(ch_i)); - memset(ch_t, 0, sizeof(ch_t)); + memset((void *)ch_i, 0, sizeof(ch_i)); + memset((void *)ch_t, 0, sizeof(ch_t)); GHIST = 0; - memset(WG, 0, sizeof(WG)); - memset(WP, 0, sizeof(WP)); - memset(ltable, 0, sizeof(ltable)); + memset((void *)WG, 0, sizeof(WG)); + memset((void *)WP, 0, sizeof(WP)); + memset((void *)ltable, 0, sizeof(ltable)); } std::string to_string() const { From 65a7c450bf4fb852cedb0fa4537e1dc52cc5844b Mon Sep 17 00:00:00 2001 From: Arnabjyoti Kalita Date: Fri, 23 May 2025 16:59:21 -0400 Subject: [PATCH 2/2] Only cast non-primitive types to a void pointer --- src/bp/cbp_tagescl_64k.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bp/cbp_tagescl_64k.h b/src/bp/cbp_tagescl_64k.h index 294b4bbb2..64faed9aa 100644 --- a/src/bp/cbp_tagescl_64k.h +++ b/src/bp/cbp_tagescl_64k.h @@ -294,10 +294,10 @@ struct SpeculativeStatesBase { ptghist = 0; phist = 0; memset((void *)ch_i, 0, sizeof(ch_i)); - memset((void *)ch_t, 0, sizeof(ch_t)); + memset(ch_t, 0, sizeof(ch_t)); GHIST = 0; - memset((void *)WG, 0, sizeof(WG)); - memset((void *)WP, 0, sizeof(WP)); + memset(WG, 0, sizeof(WG)); + memset(WP, 0, sizeof(WP)); memset((void *)ltable, 0, sizeof(ltable)); }