From 845433025772e7d5fda6bcde1cd804a36f46a4e8 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 10 Sep 2018 23:34:49 -0700 Subject: systemc: Ensure SC_LONG_64 is defined and available. The datatype code was checking if SC_LONG_64 was defined to determine if a long was 64 bits. The code that would define that value was dropped when porting over from the Accellera implementation, and so the wrong code was being included. This change both makes those checks look at the *value* of SC_LONG_64 to ensure that it's not missing by accident, and assigns it a value in sc_fxdefs.hh. Change-Id: Ie9bb1146452a3db1d9d99c0db575098bb06463ff Reviewed-on: https://gem5-review.googlesource.com/c/12616 Reviewed-by: Gabe Black Maintainer: Gabe Black --- src/systemc/ext/dt/fx/sc_fxdefs.hh | 6 ++++++ src/systemc/ext/dt/fx/scfx_utils.hh | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src/systemc/ext/dt/fx') diff --git a/src/systemc/ext/dt/fx/sc_fxdefs.hh b/src/systemc/ext/dt/fx/sc_fxdefs.hh index 8acfabfa5..c72a45afc 100644 --- a/src/systemc/ext/dt/fx/sc_fxdefs.hh +++ b/src/systemc/ext/dt/fx/sc_fxdefs.hh @@ -50,6 +50,12 @@ #include "../../utils/sc_report_handler.hh" #include "../int/sc_nbutils.hh" +#if ULONG_MAX > 0xffffffffUL +# define SC_LONG_64 1 +#else +# define SC_LONG_64 0 +#endif + namespace sc_dt { diff --git a/src/systemc/ext/dt/fx/scfx_utils.hh b/src/systemc/ext/dt/fx/scfx_utils.hh index 37c57844c..ec186c68f 100644 --- a/src/systemc/ext/dt/fx/scfx_utils.hh +++ b/src/systemc/ext/dt/fx/scfx_utils.hh @@ -67,9 +67,9 @@ inline int scfx_find_msb(unsigned long x) { int i = 0; -# if defined(SC_LONG_64) +# if SC_LONG_64 MSB_STATEMENT(32); -# endif // defined(SC_LONG_64) +# endif // SC_LONG_64 MSB_STATEMENT(16); MSB_STATEMENT(8); MSB_STATEMENT(4); @@ -86,12 +86,12 @@ inline int scfx_find_lsb(unsigned long x) { int i; -# if defined(SC_LONG_64) +# if SC_LONG_64 i = 63; LSB_STATEMENT(32); # else i = 31; -# endif // defined(SC_LONG_64) +# endif // SC_LONG_64 LSB_STATEMENT(16); LSB_STATEMENT(8); LSB_STATEMENT(4); -- cgit v1.2.3