From: ggn <ggn.dbug@gmail.com>
Date: Wed, 27 Jun 2018 10:15:36 +0000 (+0300)
Subject: More correct calculation of ^^ABSCOUNT. Also updated VS project. Now at version 2... 
X-Git-Tag: v2.1.0~59
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=commitdiff_plain;h=d3748ed651bd54f3885ef83304576d38b203844c

More correct calculation of ^^ABSCOUNT. Also updated VS project. Now at version 2.0.1.
---

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 @@
     <ClCompile Include="..\..\eagen.c" />
     <ClCompile Include="..\..\error.c" />
     <ClCompile Include="..\..\expr.c" />
+    <ClCompile Include="..\..\fltpoint.c" />
     <ClCompile Include="..\..\listing.c" />
     <ClCompile Include="..\..\mach.c" />
     <ClCompile Include="..\..\macro.c" />
     <ClCompile Include="..\..\mark.c" />
     <ClCompile Include="..\..\object.c" />
+    <ClCompile Include="..\..\op.c" />
     <ClCompile Include="..\..\procln.c" />
     <ClCompile Include="..\..\riscasm.c" />
     <ClCompile Include="..\..\rmac.c" />
@@ -45,11 +47,13 @@
     <ClInclude Include="..\..\direct.h" />
     <ClInclude Include="..\..\error.h" />
     <ClInclude Include="..\..\expr.h" />
+    <ClInclude Include="..\..\fltpoint.h" />
     <ClInclude Include="..\..\listing.h" />
     <ClInclude Include="..\..\mach.h" />
     <ClInclude Include="..\..\macro.h" />
     <ClInclude Include="..\..\mark.h" />
     <ClInclude Include="..\..\object.h" />
+    <ClInclude Include="..\..\op.h" />
     <ClInclude Include="..\..\parmode.h" />
     <ClInclude Include="..\..\procln.h" />
     <ClInclude Include="..\..\riscasm.h" />
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__