Changeset 13553

Timestamp:

Sep 20, 2019 11:58:54 AM (3 months ago)

Author:

Christian Andersson

Message:

Moved a few c functions to the template. Related to ticket:5837

Location:

branches/dev-cw-evaluator

Files:

• Compiler/ModelicaCBackEnd/templates/ceval_external_template.c (modified) (1 diff)
• RuntimeLibrary/src/evaluator/jmi_evaluator.c (modified) (1 diff)
• RuntimeLibrary/src/evaluator/jmi_evaluator_util.c (modified) (3 diffs)
• RuntimeLibrary/src/evaluator/jmi_evaluator_util.h (modified) (1 diff)

branches/dev-cw-evaluator/Compiler/ModelicaCBackEnd/templates/ceval_external_template.c

@@ -15 +15 @@
 
 #include "jmi_evaluator_util.h"
+
+/* Must be defined here in order to override the methods from jmi_global.c */
+void jmi_global_log(int warning, const char* name, const char* fmt, const char* value) {
+    _jmi_global_log(warning, name, fmt, value);
+}
+void jmi_throw() {
+    _jmi_throw();
+}
+void* jmi_global_calloc(size_t n, size_t s) {
+    return _jmi_global_calloc(n,s);
+}
 
 $ECE_external_includes$

branches/dev-cw-evaluator/RuntimeLibrary/src/evaluator/jmi_evaluator.c

@@ -1 +1 @@
 #include "jmi_evaluator_util.h"
+
+/* Must be defined here in order to override the methods from jmi_global.c */
+void jmi_global_log(int warning, const char* name, const char* fmt, const char* value) {
+    _jmi_global_log(warning, name, fmt, value);
+}
+void jmi_throw() {
+    _jmi_throw();
+}
+void* jmi_global_calloc(size_t n, size_t s) {
+    return _jmi_global_calloc(n,s);
+}
 
 /* Builtins */

branches/dev-cw-evaluator/RuntimeLibrary/src/evaluator/jmi_evaluator_util.c

@@ -85 +85 @@
 }
 
-/* Used by ModelicaUtilities */
-void jmi_global_log(int warning, const char* name, const char* fmt, const char* value) {
+void _jmi_global_log(int warning, const char* name, const char* fmt, const char* value) {
     printf("LOG\n");
     JMCEVAL_printInteger((double)warning);
@@ -100 +99 @@
 }
 
-void jmi_throw() {
+void _jmi_throw() {
     longjmp(jmceval_try_location, 1);
 }
@@ -111 +110 @@
 }
 
-void* jmi_global_calloc(size_t n, size_t s) {
+void* _jmi_global_calloc(size_t n, size_t s) {
     return jmi_dynamic_function_pool_direct_alloc(dyn_fcn_mem, n*s, 1);
 }

branches/dev-cw-evaluator/RuntimeLibrary/src/evaluator/jmi_evaluator_util.h

@@ -77 +77 @@
 void JMCEVAL_check(const char* str);
 void JMCEVAL_failed();
-void jmi_global_log(int warning, const char* name, const char* fmt, const char* value);
-void jmi_throw();
+void _jmi_global_log(int warning, const char* name, const char* fmt, const char* value);
+void _jmi_throw();
 int JMCEVAL_try();
-void* jmi_global_calloc(size_t n, size_t s);
+void* _jmi_global_calloc(size_t n, size_t s);
 jmi_dynamic_function_memory_t* jmi_dynamic_function_memory();