- Fixes FMIImport on the bootstrapped compiler

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@14140 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: sjoelund

Compiler/Script/CevalScript.mo

@@ -1505,7 +1505,7 @@ algorithm
         true = System.regularFileExists(filename);
         workdir = Util.if_(System.directoryExists(workdir), workdir, System.pwd());
         /* Initialize FMI objects */
-        (b, fmiContext, fmiInstance, fmiInfo, fmiExperimentAnnotation, fmiModelVariablesInstance, fmiModelVariablesList) = FMIExt.initializeFMIImport(filename, workdir, fmiLogLevel);
+        (b, SOME(fmiContext), SOME(fmiInstance), fmiInfo, fmiExperimentAnnotation, SOME(fmiModelVariablesInstance), fmiModelVariablesList) = FMIExt.initializeFMIImport(filename, workdir, fmiLogLevel);
         true = b; /* if something goes wrong while initializing */
         fmiModelVariablesList1 = listReverse(fmiModelVariablesList);
         s1 = System.tolower(System.platform());
@@ -1518,7 +1518,7 @@ algorithm
         filename_1 = Util.if_(b1,stringAppendList({workdir,pd,str1,"_",str2,"_FMU.mo"}),stringAppendList({str1,"_",str2,"_FMU.mo"}));
         System.writeFile(outputFile, str);
         /* Release FMI objects */
-        FMIExt.releaseFMIImport(fmiModelVariablesInstance, fmiInstance, fmiContext);
+        FMIExt.releaseFMIImport(SOME(fmiModelVariablesInstance), SOME(fmiInstance), SOME(fmiContext));
       then
         (cache,Values.STRING(filename_1),st);
 

Compiler/Util/FMIExt.mo

@@ -40,20 +40,20 @@ public function initializeFMIImport
   input String inWorkingDirectory;
   input Integer inFMILogLevel;
   output Boolean result;
-  output Integer outFMIContext;
-  output Integer outFMIInstance;
+  output Option<Integer> outFMIContext "Stores a pointer. If it is declared as Integer, it is truncated to 32-bit.";
+  output Option<Integer> outFMIInstance "Stores a pointer. If it is declared as Integer, it is truncated to 32-bit.";
   output FMI.Info outFMIInfo;
   output FMI.ExperimentAnnotation outExperimentAnnotation;
-  output Integer outModelVariablesInstance;
+  output Option<Integer> outModelVariablesInstance "Stores a pointer. If it is declared as Integer, it is truncated to 32-bit.";
   output list<FMI.ModelVariables> outModelVariablesList;
   external "C" result=FMIImpl__initializeFMIImport(inFileName, inWorkingDirectory, inFMILogLevel, outFMIContext, outFMIInstance, outFMIInfo, outExperimentAnnotation,
   outModelVariablesInstance, outModelVariablesList) annotation(Library = {"omcruntime","fmilib"});
 end initializeFMIImport;
 
 public function releaseFMIImport
-  input Integer inFMIModelVariablesInstance;
-  input Integer inFMIInstance;
-  input Integer inFMIContext;
+  input Option<Integer> inFMIModelVariablesInstance "Stores a pointer. If it is declared as Integer, it is truncated to 32-bit.";
+  input Option<Integer> inFMIInstance "Stores a pointer. If it is declared as Integer, it is truncated to 32-bit.";
+  input Option<Integer> inFMIContext "Stores a pointer. If it is declared as Integer, it is truncated to 32-bit.";
   external "C" FMIImpl__releaseFMIImport(inFMIModelVariablesInstance, inFMIInstance, inFMIContext) annotation(Library = {"omcruntime","fmilib"});
 end releaseFMIImport;
 

Compiler/runtime/FMIImpl.c

@@ -242,7 +242,7 @@ int FMIImpl__initializeFMIImport(const char* file_name, const char* working_dire
     callback_functions.freeMemory = free;
   }
   fmi_import_context_t* context = fmi_import_allocate_context(&callbacks);
-  *fmiContext = context;
+  *fmiContext = mk_some(context);
   // extract the fmu file and read the version
   fmi_version_enu_t version;
   version = fmi_import_get_fmi_version(context, file_name, working_directory);
@@ -260,7 +260,7 @@ int FMIImpl__initializeFMIImport(const char* file_name, const char* working_dire
     c_add_message(-1, ErrorType_scripting, ErrorLevel_error, gettext("Error parsing the modelDescription.xml file."), NULL, 0);
     return 0;
   }
-  *fmiInstance = fmi;
+  *fmiInstance = mk_some(fmi);
   // Load the binary (dll/so)
   jm_status_enu_t status;
   status = fmi1_import_create_dllfmu(fmi, callback_functions, 0);
@@ -315,7 +315,7 @@ int FMIImpl__initializeFMIImport(const char* file_name, const char* working_dire
   *experimentAnnotation = FMI__EXPERIMENTANNOTATION(mk_rcon(experimentStartTime), mk_rcon(experimentStopTime), mk_rcon(experimentTolerance));
   /* Read the model variables from the FMU's modelDescription.xml file and create a list of it. */
   fmi1_import_variable_list_t* model_variables_list = fmi1_import_get_variable_list(fmi);
-  *modelVariablesInstance = model_variables_list;
+  *modelVariablesInstance = mk_some(model_variables_list);
   size_t model_variables_list_size = fmi1_import_get_variable_list_size(model_variables_list);
   /* get model variables value reference list */
   const fmi1_value_reference_t* model_variables_value_reference_list = fmi1_import_get_value_referece_list(model_variables_list);
@@ -375,8 +375,11 @@ int FMIImpl__initializeFMIImport(const char* file_name, const char* working_dire
  * Releases all the instances of FMI Import.
  * From FMIL docs; Free a variable list. Note that variable lists are allocated dynamically and must be freed when not needed any longer.
  */
-void FMIImpl__releaseFMIImport(intptr_t fmiModeVariablesInstance, intptr_t fmiInstance, intptr_t fmiContext)
+void FMIImpl__releaseFMIImport(void *ptr1, void *ptr2, void *ptr3)
 {
+  intptr_t fmiModeVariablesInstance = RML_FETCH(RML_OFFSET(RML_UNTAGPTR(ptr1),1));
+  intptr_t fmiInstance = RML_FETCH(RML_OFFSET(RML_UNTAGPTR(ptr2),1));
+  intptr_t fmiContext = RML_FETCH(RML_OFFSET(RML_UNTAGPTR(ptr3),1));
   free((fmi1_import_variable_list_t*)fmiModeVariablesInstance);
   fmi1_import_t* fmi = (fmi1_import_t*)fmiInstance;
   fmi1_import_destroy_dllfmu(fmi);

Compiler/runtime/FMI_rml.c

@@ -49,19 +49,19 @@ RML_BEGIN_LABEL(FMIExt__initializeFMIImport)
   void* modelVariablesList;
   rmlA0 = FMIImpl__initializeFMIImport(filename, workingDirectory, RML_UNTAGFIXNUM(rmlA2), &fmiContext, &fmiInstance, &fmiInfo, &experimentAnnotation,
       &modelVariablesInstance, &modelVariablesList) ? RML_TRUE : RML_FALSE;
-  rmlA1 = (void*) mk_icon(fmiContext);
-  rmlA2 = (void*) mk_icon(fmiInstance);
+  rmlA1 = (void*) fmiContext;
+  rmlA2 = (void*) fmiInstance;
   rmlA3 = fmiInfo;
   rmlA4 = experimentAnnotation;
-  rmlA5 = (void*) mk_icon(modelVariablesInstance);
+  rmlA5 = (void*) modelVariablesInstance;
   rmlA6 = modelVariablesList;
   RML_TAILCALLK(rmlSC);
 }
 RML_END_LABEL
 
 RML_BEGIN_LABEL(FMIExt__releaseFMIImport)
 {
-  FMIImpl__releaseFMIImport(RML_UNTAGFIXNUM(rmlA0), RML_UNTAGFIXNUM(rmlA1), RML_UNTAGFIXNUM(rmlA2));
+  FMIImpl__releaseFMIImport(rmlA0, rmlA1, rmlA2);
   RML_TAILCALLK(rmlSC);
 }
 RML_END_LABEL