Move omc_assert functions to the threadData

WIP: Note: OMEdit, etc would need to initialize the assertion routines.
This could be done from Main.init() to help that.

Author: sjoelund

Compiler/Template/CodegenCFunctions.tpl

@@ -4779,7 +4779,7 @@ template indexSubs(list<Dimension> dims, list<Subscript> subs, Context context,
 ::=
   if intNe(listLength(dims),listLength(subs)) then
     error(sourceInfo(),'indexSubs got different number of dimensions and subscripts')
-  else '[calc_base_index_dims_subs(<%listLength(dims)%><%
+  else '[calc_base_index_dims_subs(threadData, <%listLength(dims)%><%
     dims |> dim => ', <%dimension(dim)%>'%><%
     subs |> INDEX(__) => ', <%daeSubscriptExp(exp, context, &preExp, &varDecls, &auxFunction)%>'
     %>)]'

SimulationRuntime/c/gc/omc_gc.h

@@ -52,6 +52,7 @@ extern "C" {
 #if defined(_MSC_VER)
 #include "omc_inline.h"
 #endif
+typedef struct assertions_s assertions_t;
 
 typedef struct {
   void (*init)(void);
@@ -138,6 +139,7 @@ typedef struct threadData_s {
   void *plotClassPointer;
   PlotCallback plotCB;
   void *stackBottom; /* Actually offset 64 kB from bottom, just to never reach the bottom */
+  assertions_t *assert;
 } threadData_t;
 
 typedef threadData_t* OpenModelica_threadData_ThreadData;

SimulationRuntime/c/util/base_array.c

@@ -305,7 +305,7 @@ size_t calc_base_index(int ndims, const _index_t *idx_vec, const base_array_t *a
     return index;
 }
 
-size_t calc_base_index_dims_subs(int ndims,...)
+size_t calc_base_index_dims_subs(threadData_t *threadData, int ndims,...)
 {
 
     int i;
@@ -327,8 +327,7 @@ size_t calc_base_index_dims_subs(int ndims,...)
     index = 0;
     for(i = 0; i < ndims; ++i) {
         if (subs[i] < 0 || subs[i] >= dims[i]) {
-          FILE_INFO info = omc_dummyFileInfo;
-          omc_assert(NULL, info, "Dimension %d has bounds 1..%d, got array subscript %d", i+1, dims[i], subs[i]+1);
+          threadData->assert->error(threadData, NULL, "Dimension %d has bounds 1..%d, got array subscript %d", i+1, dims[i], subs[i]+1);
         }
         index = (index * dims[i]) + subs[i];
     }

SimulationRuntime/c/util/base_array.h

@@ -100,7 +100,7 @@ size_t calc_base_index_spec(int ndims, const _index_t* idx_vec,
 size_t calc_base_index(int ndims, const _index_t *idx_vec, const base_array_t *arr);
 size_t calc_base_index_va(const base_array_t *source, int ndims, va_list ap);
 
-size_t calc_base_index_dims_subs(int ndims,...);
+size_t calc_base_index_dims_subs(threadData_t *threadData, int ndims, ...);
 
 int index_spec_fit_base_array(const index_spec_t *s, const base_array_t *a);
 

SimulationRuntime/c/util/omc_error.h

@@ -32,6 +32,8 @@
 #ifndef OMC_ERROR_H
 #define OMC_ERROR_H
 
+typedef struct threadData_s threadData_t;
+
 #include "openmodelica.h"
 #include "omc_msvc.h"
 
@@ -56,10 +58,13 @@ typedef struct _FILE_INFO
 #define omc_dummyFileInfo {"",0,0,0,0,0}
 
 DLLExport extern void printInfo(FILE *stream, FILE_INFO info);
-DLLExport extern void (*omc_assert)(threadData_t*, FILE_INFO, const char*, ...) __attribute__ ((noreturn));
-DLLExport extern void (*omc_assert_warning)(FILE_INFO, const char*, ...);
-DLLExport extern void (*omc_terminate)(FILE_INFO, const char*, ...);
-DLLExport extern void (*omc_throw)(threadData_t*) __attribute__ ((noreturn));
+
+typedef struct assertions_s {
+ void (*error)(threadData_t*, FILE_INFO*, const char*, ...) __attribute__ ((noreturn));
+ void (*warning)(threadData_t*, FILE_INFO*, const char*, ...);
+ void (*terminate)(threadData_t*, FILE_INFO*, const char*, ...);
+ void (*mmc_throw)(threadData_t*) __attribute__ ((noreturn));
+} assertions_t;
 
 DLLExport extern void (*omc_assert_withEquationIndexes)(threadData_t*,FILE_INFO, const int*, const char*, ...) __attribute__ ((noreturn));
 DLLExport extern void (*omc_assert_warning_withEquationIndexes)(FILE_INFO, const int*, const char*, ...);