folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

SCP: Avoid use of 64 bit integers in SCP when host doesn't support it

Browse source 
As mentioned for VAX in #394
This commit is contained in:
Mark Pizzolato 2017-02-08 16:44:49 -08:00
parent 91f151932c
commit 69d2ba5193
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scp.c
View file

@ -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)); 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')) { 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')) { if (sim_deb_switches & SWMASK ('P')) {

7
sim_defs.h
View file

@ -243,8 +243,15 @@ typedef uint32 t_addr;
#if defined (_WIN32) /* Actually, a GCC issue */ #if defined (_WIN32) /* Actually, a GCC issue */
#define LL_FMT "I64" #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 #else
#define LL_FMT "ll" #define LL_FMT "ll"
#define LL_TYPE long long
#endif
#endif #endif
#if defined (VMS) && (defined (__ia64) || defined (__ALPHA)) #if defined (VMS) && (defined (__ia64) || defined (__ALPHA))