From d3748ed651bd54f3885ef83304576d38b203844c Mon Sep 17 00:00:00 2001 From: ggn Date: Wed, 27 Jun 2018 13:15:36 +0300 Subject: [PATCH] More correct calculation of ^^ABSCOUNT. Also updated VS project. Now at version 2.0.1. --- Vs2015/rmac/rmac.vcxproj | 4 ++++ expr.c | 12 ++++++++++-- version.h | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Vs2015/rmac/rmac.vcxproj b/Vs2015/rmac/rmac.vcxproj index 9e481bf..f2212a7 100644 --- a/Vs2015/rmac/rmac.vcxproj +++ b/Vs2015/rmac/rmac.vcxproj @@ -26,11 +26,13 @@ + + @@ -45,11 +47,13 @@ + + diff --git a/expr.c b/expr.c index d1ee1f5..ebb17b8 100644 --- a/expr.c +++ b/expr.c @@ -155,8 +155,16 @@ int expr1(void) switch (*tok++) { case CR_ABSCOUNT: - *evalTokenBuffer.u32++ = CONST; - *evalTokenBuffer.u64++ = (uint64_t)sect[ABS].sloc; + if (cursect != ABS) + { + *evalTokenBuffer.u32++ = CONST; + *evalTokenBuffer.u64++ = sect[ABS].sloc; + } + else + { + *evalTokenBuffer.u32++ = CONST; + *evalTokenBuffer.u64++ = sloc; + } break; case CR_TIME: *evalTokenBuffer.u32++ = CONST; diff --git a/version.h b/version.h index a6184b5..8c1e411 100644 --- a/version.h +++ b/version.h @@ -15,7 +15,7 @@ #define MAJOR 2 // Major version number #define MINOR 0 // Minor version number -#define PATCH 0 // Patch release number +#define PATCH 1 // Patch release number #endif // __VERSION_H__ -- 2.37.2