Changeset a7cd739 in OpenModelica

Timestamp:

2023-03-27T17:19:14+02:00 (13 months ago)

Author:

GitHub <noreply@…>

Branches:

maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master

Children:

92b6780

Parents:

10cfde04

git-author:

Per Östlund <per.ostlund@…> (03/27/23 17:19:14)

git-committer:

GitHub <noreply@…> (03/27/23 17:19:14)

Message:

Fix intString/stringInt on 64-bit Windows (#10453)

• Change intString to use the PRINT_MMC_SINT_T macro for the format string instead of assuming it's a long, and change to snprintf just to be safe.
• Change stringInt to use modelica_integer instead of long, and use MODELICA_INT_MIN/MAX instead of INT_MIN/MAX.

Location:

OMCompiler/SimulationRuntime/c

Files:

• meta/meta_modelica_builtin.c (modified) (2 diffs)
• openmodelica_types.h (modified) (3 diffs)

OMCompiler/SimulationRuntime/c/meta/meta_modelica_builtin.c

@@ -50 +50 @@
   if (i>=0 && i<=9) /* Small integers are used so much it makes sense to cache them */
     return mmc_strings_len1['0'+i];
-  sprintf(buffer, "%ld", (long) i);
+  snprintf(buffer, 22, "%" PRINT_MMC_SINT_T, i);
   res = mmc_mk_scon(buffer);
   MMC_CHECK_STRING(res);
@@ -81 +81 @@
 modelica_integer nobox_stringInt(threadData_t *threadData,metamodelica_string s)
 {
-  long res;
+  modelica_integer res;
   char *endptr,*str=MMC_STRINGDATA(s);
   MMC_CHECK_STRING(s);
   errno = 0;
+#if defined(_WIN64) || defined(__MINGW64__)
+  res = strtoll(str,&endptr,10);
+#else
   res = strtol(str,&endptr,10);
+#endif
   if (errno != 0 || str == endptr)
     MMC_THROW_INTERNAL();
   if (*endptr != '\0')
     MMC_THROW_INTERNAL();
-  if (res > INT_MAX || res < INT_MIN)
+  if (res > MODELICA_INT_MAX || res < MODELICA_INT_MIN)
     MMC_THROW_INTERNAL();
   return res;

OMCompiler/SimulationRuntime/c/openmodelica_types.h

@@ -49 +49 @@
 typedef unsigned long mmc_uint_t;
 typedef long mmc_sint_t;
-#define MODELICA_INT_MIN LONG_MIN;
-#define MODELICA_INT_MAX LONG_MAX;
+#define MODELICA_INT_MIN LONG_MIN
+#define MODELICA_INT_MAX LONG_MAX
 
 #elif defined(_LLP64) || defined(_WIN64) || defined(__MINGW64__) /* windows 64bit */
@@ -67 +67 @@
 typedef unsigned long long mmc_uint_t;
 typedef long long mmc_sint_t;
-#define MODELICA_INT_MIN LONG_MIN;
-#define MODELICA_INT_MAX LONG_MAX;
+#define MODELICA_INT_MIN LONG_MIN
+#define MODELICA_INT_MAX LONG_MAX
 
 #else /* 32bit platforms */
@@ -79 +79 @@
 typedef unsigned int mmc_uint_t;
 typedef int mmc_sint_t;
-#define MODELICA_INT_MIN INT_MIN;
-#define MODELICA_INT_MAX INT_MAX;
+#define MODELICA_INT_MIN INT_MIN
+#define MODELICA_INT_MAX INT_MAX
 
 #endif