From 8f67315eb6e52baf2972f16e57410d49e605f163 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Fri, 1 Jan 2021 10:24:22 +0100 Subject: [PATCH] core: Use unsigned constants. * src/gc.c (FRAME_SIZE, M2_CELL_SIZE): Declare unsigned. (gc_init): Use unsigned suffixes for divisions. * src/posix.c (TIME_UNITS_PER_SECOND): Declare unsigned. (UL1000000000): New constant. (seconds_and_nanoseconds_to_long): Use it. * src/gc.c (U10, U100): New constants. (gc_init): Use them. --- src/gc.c | 10 +++++++--- src/posix.c | 10 ++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/gc.c b/src/gc.c index ff411292..55e4dec3 100644 --- a/src/gc.c +++ b/src/gc.c @@ -30,7 +30,7 @@ int g_dump_filedes; -#define M2_CELL_SIZE 1 +#define M2_CELL_SIZE 1U // CONSTANT M2_CELL_SIZE 12 char * @@ -47,6 +47,10 @@ news_bytes (struct scm *x) return p + (2 * sizeof (long)); } +#define U10 10U +// CONSTANT U10 10 +#define U100 100U +// CONSTANT U100 100 void gc_init () { @@ -71,11 +75,11 @@ gc_init () p = getenv ("MES_ARENA"); if (p != 0) ARENA_SIZE = atoi (p); - JAM_SIZE = ARENA_SIZE / 10; + JAM_SIZE = ARENA_SIZE / U10; p = getenv ("MES_JAM"); if (p != 0) JAM_SIZE = atoi (p); - GC_SAFETY = ARENA_SIZE / 100; + GC_SAFETY = ARENA_SIZE / U100; p = getenv ("MES_SAFETY"); if (p != 0) GC_SAFETY = atoi (p); diff --git a/src/posix.c b/src/posix.c index 51d71a67..538ebcd6 100644 --- a/src/posix.c +++ b/src/posix.c @@ -380,11 +380,11 @@ waitpid_ (struct scm *pid, struct scm *options) #if __x86_64__ /* Nanoseconds on 64-bit systems with POSIX timers. */ // CONSTANT TIME_UNITS_PER_SECOND 1000000000 -#define TIME_UNITS_PER_SECOND 1000000000 +#define TIME_UNITS_PER_SECOND 1000000000U #else /* Milliseconds for everyone else. */ // CONSTANT TIME_UNITS_PER_SECOND 1000 -#define TIME_UNITS_PER_SECOND 1000 +#define TIME_UNITS_PER_SECOND 1000U #endif struct scm * @@ -408,6 +408,8 @@ gettimeofday_ () /*:((name . "gettimeofday")) */ return cons (make_number (time->tv_sec), make_number (time->tv_usec)); } +#define UL1000000000 1000000000UL +// CONSTANT UL1000000000 1000000000 long seconds_and_nanoseconds_to_long (long s, long ns) { @@ -415,9 +417,9 @@ seconds_and_nanoseconds_to_long (long s, long ns) if (ns < 0) { uns = - ns; - return s * TIME_UNITS_PER_SECOND - uns / (1000000000 / TIME_UNITS_PER_SECOND); + return s * TIME_UNITS_PER_SECOND - uns / (UL1000000000 / TIME_UNITS_PER_SECOND); } - return s * TIME_UNITS_PER_SECOND + uns / (1000000000 / TIME_UNITS_PER_SECOND); + return s * TIME_UNITS_PER_SECOND + uns / (UL1000000000 / TIME_UNITS_PER_SECOND); } struct scm *