From 0937de3beed443974d07dfa0652936855c335dda Mon Sep 17 00:00:00 2001 From: Cary R Date: Mon, 17 Jun 2024 09:29:45 -0700 Subject: [PATCH] Update to the latest GTKWave files --- vpi/fstapi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/vpi/fstapi.c b/vpi/fstapi.c index 91c5401ee..6b6adefc5 100644 --- a/vpi/fstapi.c +++ b/vpi/fstapi.c @@ -347,8 +347,9 @@ return(NULL); static void *fstMmap2(size_t __len, int __fd, fst_off_t __off) { +DWORD64 len64 = __len; /* Must be 64-bit for shift below */ HANDLE handle = CreateFileMapping((HANDLE)_get_osfhandle(__fd), NULL, - PAGE_READWRITE, (DWORD)(__len >> 32), + PAGE_READWRITE, (DWORD)(len64 >> 32), (DWORD)__len, NULL); if (!handle) { return NULL; } @@ -1646,7 +1647,11 @@ if(1) { if(vm4ip[2] != prev_alias) { - fpos += fstWriterSVarint(f, (((int64_t)((int32_t)(prev_alias = vm4ip[2]))) << 1) | 1); + int32_t t_i32 = ((int32_t)(prev_alias = vm4ip[2])); /* vm4ip is generic unsigned data */ + int64_t t_i64 = (int64_t)t_i32; /* convert to signed */ + uint64_t t_u64 = (uint64_t)t_i64; /* sign extend through 64b */ + + fpos += fstWriterSVarint(f, (int64_t)((t_u64 << 1) | 1)); /* all in this block was: fpos += fstWriterSVarint(f, (((int64_t)((int32_t)(prev_alias = vm4ip[2]))) << 1) | 1); */ } else {