X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/62e3c17b5b34bdb88da1b5a352c7066cfc8008f9..d92624dccee63e8bee8653e8ae845ffad3490b67:/int64.c diff --git a/int64.c b/int64.c index b43feea1..7997114a 100644 --- a/int64.c +++ b/int64.c @@ -5,12 +5,12 @@ */ #include +#include -typedef struct { - unsigned long hi, lo; -} uint64, int64; +#include "int64.h" -uint64 uint64_div10(uint64 x, int *remainder) { +uint64 uint64_div10(uint64 x, int *remainder) +{ uint64 y; int rem, r2; y.hi = x.hi / 10; @@ -30,7 +30,8 @@ uint64 uint64_div10(uint64 x, int *remainder) { return y; } -void uint64_decimal(uint64 x, char *buffer) { +void uint64_decimal(uint64 x, char *buffer) +{ char buf[20]; int start = 20; int d; @@ -41,26 +42,38 @@ void uint64_decimal(uint64 x, char *buffer) { buf[--start] = d + '0'; } - memcpy(buffer, buf+start, sizeof(buf)-start); - buffer[sizeof(buf)-start] = '\0'; + memcpy(buffer, buf + start, sizeof(buf) - start); + buffer[sizeof(buf) - start] = '\0'; } -uint64 uint64_make(unsigned long hi, unsigned long lo) { +uint64 uint64_make(unsigned long hi, unsigned long lo) +{ uint64 y; y.hi = hi; y.lo = lo; return y; } -uint64 uint64_add(uint64 x, uint64 y) { +uint64 uint64_add(uint64 x, uint64 y) +{ x.lo += y.lo; x.hi += y.hi + (x.lo < y.lo ? 1 : 0); return x; } -uint64 uint64_add32(uint64 x, unsigned long y) { +uint64 uint64_add32(uint64 x, unsigned long y) +{ uint64 yy; yy.hi = 0; yy.lo = y; return uint64_add(x, yy); } + +int uint64_compare(uint64 x, uint64 y) +{ + if (x.hi != y.hi) + return x.hi < y.hi ? -1 : +1; + if (x.lo != y.lo) + return x.lo < y.lo ? -1 : +1; + return 0; +}