From 69d2ba51935d7c0a7c91963bb7af36876205b616 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Wed, 8 Feb 2017 16:44:49 -0800 Subject: [PATCH] SCP: Avoid use of 64 bit integers in SCP when host doesn't support it As mentioned for VAX in #394 --- scp.c | 2 +- sim_defs.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/scp.c b/scp.c index 2618a298..cb7d12e9 100644 --- a/scp.c +++ b/scp.c @@ -10517,7 +10517,7 @@ if (sim_deb_switches & (SWMASK ('T') | SWMASK ('R') | SWMASK ('A'))) { sprintf(tim_t, "%02d:%02d:%02d.%03d ", now->tm_hour, now->tm_min, now->tm_sec, (int)(time_now.tv_nsec/1000000)); } if (sim_deb_switches & SWMASK ('A')) { - sprintf(tim_t, "%" LL_FMT "d.%03d ", (long long)(time_now.tv_sec), (int)(time_now.tv_nsec/1000000)); + sprintf(tim_t, "%" LL_FMT "d.%03d ", (LL_TYPE)(time_now.tv_sec), (int)(time_now.tv_nsec/1000000)); } } if (sim_deb_switches & SWMASK ('P')) { diff --git a/sim_defs.h b/sim_defs.h index ac3c85f0..a21d3902 100644 --- a/sim_defs.h +++ b/sim_defs.h @@ -243,8 +243,15 @@ typedef uint32 t_addr; #if defined (_WIN32) /* Actually, a GCC issue */ #define LL_FMT "I64" +#define LL_TYPE long long +#else +#if defined (__VAX) /* No 64 bit ints on VAX */ +#define LL_FMT "l" +#define LL_TYPE long #else #define LL_FMT "ll" +#define LL_TYPE long long +#endif #endif #if defined (VMS) && (defined (__ia64) || defined (__ALPHA))