- Make it possible to change ModelicaAllocateString to use garbage collected allocation in the bootstrapped compiler

sjoelund · sjoelund · commit 05e4ab631d8b · 2013-08-19T10:03:17.000Z
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@16836 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
diff --git a/Compiler/Template/CodegenC.tpl b/Compiler/Template/CodegenC.tpl
@@ -9740,6 +9740,7 @@ int rml_execution_failed(mmc_GC_local_state_type local_GC_state)
 
 int main(int argc, char **argv)
 {
+  OpenModelica_ExternalC_allocation_function = mmc_mk_scon_len_ret_ptr;
   init_metamodelica_segv_handler();
   if (!mmc_GC_state)
   {
diff --git a/Compiler/runtime/Corba_omc.cpp b/Compiler/runtime/Corba_omc.cpp
@@ -34,6 +34,7 @@
 extern "C" {
 
 #include "meta_modelica.h"
+#include "ModelicaUtilities.h"
 
 extern int Corba_haveCorba()
 {
@@ -52,7 +53,8 @@ extern void Corba_setSessionName(const char* _inSessionName)
 
 extern const char* Corba_waitForCommand()
 {
-  return strdup(CorbaImpl__waitForCommand());
+  const char *res = CorbaImpl__waitForCommand();
+  return strcpy(ModelicaAllocateString(strlen(res)), res);
 }
 
 extern void Corba_initialize()
diff --git a/Compiler/runtime/Dynload_omc.cpp b/Compiler/runtime/Dynload_omc.cpp
@@ -41,6 +41,7 @@ extern "C" {
 #include "rml_compatibility.h"
 #include "OpenModelicaBootstrappingHeader.h"
 #include "Dynload.cpp"
+#include "ModelicaUtilities.h"
 
 extern void* DynLoad_executeFunction(int _inFuncHandle, void* _inValLst, int _inPrintDebug)
 {
@@ -59,7 +60,7 @@ extern void* omc_Absyn_pathString2(void*,void*);
 static const char* path_to_name(void* path, char del)
 {
   char delStr[2] = {del,'\0'};
-  return strdup(MMC_STRINGDATA(omc_Absyn_pathString2(path, mmc_mk_scon(delStr))));
+  return MMC_STRINGDATA(omc_Absyn_pathString2(path, mmc_mk_scon(delStr)));
 }
 
 }
diff --git a/Compiler/runtime/Error_omc.cpp b/Compiler/runtime/Error_omc.cpp
@@ -68,13 +68,13 @@ extern void* Error_getMessages()
 extern const char* Error_printErrorsNoWarning()
 {
   std::string res = ErrorImpl__printErrorsNoWarning();
-  return MMC_STRINGDATA(mmc_mk_scon(res.c_str()));
+  return strcpy(ModelicaAllocateString(res.size()), res.c_str());
 }
 
 extern const char* Error_printMessagesStr()
 {
   std::string res = ErrorImpl__printMessagesStr();
-  return MMC_STRINGDATA(mmc_mk_scon(res.c_str()));
+  return strcpy(ModelicaAllocateString(res.size()), res.c_str());
 }
 
 extern void Error_addSourceMessage(int _id, void *msg_type, void *severity, int _sline, int _scol, int _eline, int _ecol, int _read_only, const char* _filename, const char* _msg, void* tokenlst)
diff --git a/Compiler/runtime/Print_omc.c b/Compiler/runtime/Print_omc.c
@@ -33,6 +33,7 @@
 #include "meta_modelica.h"
 
 #include "printimpl.c"
+#include "ModelicaUtilities.h"
 
 extern int Print_saveAndClearBuf()
 {
@@ -76,15 +77,15 @@ extern const char* Print_getString(void)
   if (res == NULL)
     MMC_THROW();
   // fprintf(stderr, "Print_getString: %s##\n", res);fflush(NULL);
-  return res; // strdup(res);
+  return strcpy(ModelicaAllocateString(strlen(res)), res);
 }
 
 extern const char* Print_getErrorString(void)
 {
   const char* res = PrintImpl__getErrorString();
   if (res == NULL)
     MMC_THROW();
-  return res; // strdup(res);
+  return strcpy(ModelicaAllocateString(strlen(res)), res);
 }
 
 extern void Print_clearErrorBuf(void)
diff --git a/Compiler/runtime/Settings_omc.cpp b/Compiler/runtime/Settings_omc.cpp
@@ -35,6 +35,7 @@
 #endif
 
 #include "meta_modelica.h"
+#include "ModelicaUtilities.h"
 
 extern "C" {
 
@@ -45,7 +46,7 @@ extern const char* Settings_getInstallationDirectoryPath()
   const char *path = SettingsImpl__getInstallationDirectoryPath();
   if (path == NULL)
     MMC_THROW();
-  return strdup(path);
+  return strcpy(ModelicaAllocateString(strlen(path)), path);
 }
 
 extern const char* Settings_getModelicaPath(int runningTestsuite)
@@ -58,7 +59,8 @@ extern const char* Settings_getModelicaPath(int runningTestsuite)
 
 extern const char* Settings_getCompileCommand()
 {
-  return strdup(SettingsImpl__getCompileCommand());
+  const char *res = SettingsImpl__getCompileCommand();
+  return strcpy(ModelicaAllocateString(strlen(res)), res);
 }
 
 extern void Settings_setPlotCommand(const char* _inString);
diff --git a/Compiler/runtime/System_omc.c b/Compiler/runtime/System_omc.c
@@ -44,6 +44,7 @@ extern "C"
 #include "openmodelica.h"
 #include "meta_modelica.h"
 #include "rml_compatibility.h"
+#include "ModelicaUtilities.h"
 #define ADD_METARECORD_DEFINTIONS static
 #include "OpenModelicaBootstrappingHeader.h"
 #include "systemimpl.c"
@@ -93,7 +94,7 @@ extern const char* System_stringFindString(const char* str, const char* searchSt
   const char *found = strstr(str, searchStr);
   if (found == NULL)
     MMC_THROW();
-  return strdup(found);
+  return strcpy(ModelicaAllocateString(strlen(found)), found);
 }
 
 extern void System_realtimeTick(int ix)
@@ -127,27 +128,27 @@ extern const char* System_getRTLibs()
 
 extern const char* System_getCCompiler()
 {
-  return strdup(cc);
+  return strcpy(ModelicaAllocateString(strlen(cc)), cc);
 }
 
 extern const char* System_getCXXCompiler()
 {
-  return strdup(cxx);
+  return strcpy(ModelicaAllocateString(strlen(cxx)), cxx);
 }
 
 extern const char* System_getLinker()
 {
-  return strdup(linker);
+  return strcpy(ModelicaAllocateString(strlen(linker)), linker);
 }
 
 extern const char* System_getLDFlags()
 {
-  return strdup(ldflags);
+  return strcpy(ModelicaAllocateString(strlen(ldflags)), ldflags);
 }
 
 extern const char* System_getCFlags()
 {
-  return strdup(cflags);
+  return strcpy(ModelicaAllocateString(strlen(cflags)), cflags);
 }
 
 extern const char* System_getExeExt()
@@ -184,7 +185,8 @@ extern const char* System_trimChar(const char* str, const char* char_to_remove)
 
 extern const char* System_basename(const char* str)
 {
-  return strdup(SystemImpl__basename(str));
+  char *res = SystemImpl__basename(str);
+  return strcpy(ModelicaAllocateString(strlen(res)), res);
 }
 
 extern const char* System_dirname(const char* str)
@@ -195,10 +197,11 @@ extern const char* System_dirname(const char* str)
   char drive[_MAX_DRIVE], dir[_MAX_DIR], filename[_MAX_FNAME], extension[_MAX_EXT];
   _splitpath(str, drive, dir, filename, extension);
   sprintf(cpy, "%s/%s/",drive,dir);
-  res = strdup(cpy);
+  res = cpy;
 #else
-  res = strdup(dirname(cpy));
+  res = dirname(cpy);
 #endif
+  res = strcpy(ModelicaAllocateString(strlen(res)), res);
   free(cpy);
   return res;
 }
@@ -347,7 +350,7 @@ extern char* System_substring(const char *str, int start, int stop)
 extern char* System_toupper(const char *str)
 {
   int i;
-  char* strToUpper = strdup(str);
+  char* strToUpper = strcpy(ModelicaAllocateString(strlen(str)),str);
   for (i = 0; i < strlen(strToUpper); i++)
   {
     strToUpper[i] = toupper(strToUpper[i]);
@@ -358,7 +361,7 @@ extern char* System_toupper(const char *str)
 extern char* System_tolower(const char *str)
 {
   int i;
-  char* strToLower = strdup(str);
+  char* strToLower = strcpy(ModelicaAllocateString(strlen(str)),str);
   for (i = 0; i < strlen(strToLower); i++)
   {
     strToLower[i] = tolower(strToLower[i]);
@@ -369,7 +372,7 @@ extern char* System_tolower(const char *str)
 const char* System_getClassnamesForSimulation()
 {
   if(class_names_for_simulation)
-    return strdup(class_names_for_simulation);
+    return strcpy(ModelicaAllocateString(strlen(class_names_for_simulation)),class_names_for_simulation);
   else
     return "{}";
 }
@@ -469,7 +472,7 @@ extern const char* System_readEnv(const char *envname)
 {
   char *envvalue = getenv(envname);
   if (envvalue == NULL) MMC_THROW();
-  return strdup(envvalue);
+  return strcpy(ModelicaAllocateString(strlen(envvalue)),envvalue);
 }
 
 extern void System_getCurrentDateTime(int* sec, int* min, int* hour, int* mday, int* mon, int* year)
@@ -488,7 +491,8 @@ extern void System_getCurrentDateTime(int* sec, int* min, int* hour, int* mday,
 
 extern const char* System_getUUIDStr()
 {
-  return strdup(SystemImpl__getUUIDStr());
+  char *res =  SystemImpl__getUUIDStr();
+  return strcpy(ModelicaAllocateString(strlen(res)),res);
 }
 
 extern int System_loadLibrary(const char *name, int printDebug)
@@ -672,7 +676,9 @@ extern void System_getLoadModelPath(const char *className, void *prios, void *mp
 {
   *name = NULL;
   if (SystemImpl__getLoadModelPath(className,prios,mps,dir,name,isDir)) MMC_THROW();
-  /* TODO: Do not strdup in parent... */
+  char *res = strcpy(ModelicaAllocateString(strlen(name)),name);
+  free(*name);
+  *name = res;
 }
 
 extern const char* System_getMakeCommand()
diff --git a/Compiler/runtime/UnitParserExt_omc.cpp b/Compiler/runtime/UnitParserExt_omc.cpp
@@ -1,6 +1,7 @@
 /* External interface for UnitParserExt module */
 #include "unitparser.h"
 #include "unitparserext.cpp"
+#include "ModelicaUtilities.h"
 
 extern "C"
 {
@@ -34,7 +35,7 @@ const char* UnitParserExt_unit2str(void *nums, void *denoms, void *tpnoms, void
   //string res = unitParser->unit2str(unit);
   string res = unitParser->prettyPrintUnit2str(unit);
 
-  return strdup(res.c_str());
+  return strcpy(ModelicaAllocateString(res.size()), res.c_str());
 }
 
 void UnitParserExt_str2unit(const char *inStr, void **nums, void **denoms, void **tpnoms, void **tpdenoms, void **tpstrs)
diff --git a/Compiler/runtime/systemimpl.c b/Compiler/runtime/systemimpl.c
@@ -43,6 +43,7 @@ extern "C" {
 
 #include "meta_modelica.h"
 #include <limits.h>
+#include "ModelicaUtilities.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Makefile.in b/Makefile.in
@@ -102,7 +102,7 @@ bootstrap-from-compiled:
 	$(MAKE) -C testsuite/openmodelica/bootstrapping -f LinkMain.makefile bootstrap-from-compiled
 	$(MAKE) omlibrary
 
-bootstrap-dependencies: omc-diff interactive docs fmi fmil opencl_rt runtimeCPPinstall
+bootstrap-dependencies: omc-diff interactive docs fmi fmil opencl_rt
 	$(MAKE) -C Compiler/runtime install
 	$(MAKE) -C Compiler builtin install_scripts
 	$(MAKE) -C Parser install
diff --git a/SimulationRuntime/c/meta/meta_modelica.c b/SimulationRuntime/c/meta/meta_modelica.c
@@ -87,6 +87,18 @@ void *mmc_mk_box_no_assign(int slots, unsigned ctor)
     return MMC_TAGPTR(p);
 }
 
+char* mmc_mk_scon_len_ret_ptr(size_t nbytes)
+{
+    unsigned header = MMC_STRINGHDR(nbytes);
+    unsigned nwords = MMC_HDRSLOTS(header) + 1;
+    struct mmc_string *p;
+    void *res;
+    p = (struct mmc_string *) mmc_alloc_words(nwords);
+    p->header = header;
+    res = MMC_TAGPTR(p);
+    return MMC_STRINGDATA(res);
+}
+
 modelica_boolean valueEq(modelica_metatype lhs, modelica_metatype rhs)
 {
   mmc_uint_t h_lhs;
diff --git a/SimulationRuntime/c/meta/meta_modelica.h b/SimulationRuntime/c/meta/meta_modelica.h
@@ -303,6 +303,8 @@ static inline void* mmc_mk_scon_len(unsigned nbytes)
     return res;
 }
 
+char* mmc_mk_scon_len_ret_ptr(size_t nbytes);
+
 static inline void *mmc_mk_box0(unsigned ctor)
 {
     struct mmc_struct *p = (struct mmc_struct *) mmc_alloc_words(1);
diff --git a/SimulationRuntime/c/util/ModelicaUtilities.c b/SimulationRuntime/c/util/ModelicaUtilities.c
@@ -72,12 +72,12 @@ void ModelicaFormatError(const char* string, ...) {
 }
 
 char* ModelicaAllocateString(size_t len) {
-  char *res = alloc_modelica_string(len);
+  char *res = ModelicaAllocateStringWithErrorReturn(len);
   if(!res)
     ModelicaFormatError("%s:%d: ModelicaAllocateString failed", __FILE__, __LINE__);
   return res;
 }
 
 char* ModelicaAllocateStringWithErrorReturn(size_t len) {
-  return alloc_modelica_string(len);
+  return OpenModelica_ExternalC_allocation_function(len);
 }
diff --git a/SimulationRuntime/c/util/modelica_string.c b/SimulationRuntime/c/util/modelica_string.c
@@ -141,10 +141,13 @@ modelica_string_t alloc_modelica_string(int length)
 {
     /* Reserve place for null terminator too.*/
     modelica_string_t dest = (modelica_string_t) char_alloc(length+1);
-    dest[length]=0;
+    if (dest != 0) {
+      dest[length]=0;
+    }
     return dest;
 }
 
+extern char*(*OpenModelica_ExternalC_allocation_function)(size_t) = alloc_modelica_string;
 
 void free_modelica_string(modelica_string_t* a)
 {
diff --git a/SimulationRuntime/c/util/modelica_string.h b/SimulationRuntime/c/util/modelica_string.h
@@ -49,6 +49,8 @@ extern int modelica_string_length(modelica_string_const a);
 extern modelica_string_const init_modelica_string(modelica_string_const str);
 
 extern modelica_string_t alloc_modelica_string(int length);
+/* In case we do not use the memory pool in the runtime */
+extern char* (*OpenModelica_ExternalC_allocation_function)(size_t length);
 
 /* formatting String functions */
 extern modelica_string_const modelica_real_to_modelica_string_format(modelica_real r, modelica_string_const format);

Original file line number	Diff line number	Diff line change
`@@ -9740,6 +9740,7 @@ int rml_execution_failed(mmc_GC_local_state_type local_GC_state)`
`9740`	`9740`
`9741`	`9741`	`int main(int argc, char **argv)`
`9742`	`9742`	`{`
	`9743`	`+ OpenModelica_ExternalC_allocation_function = mmc_mk_scon_len_ret_ptr;`
`9743`	`9744`	`init_metamodelica_segv_handler();`
`9744`	`9745`	`if (!mmc_GC_state)`
`9745`	`9746`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`extern "C" {`
`35`	`35`
`36`	`36`	`#include "meta_modelica.h"`
	`37`	`+#include "ModelicaUtilities.h"`
`37`	`38`
`38`	`39`	`extern int Corba_haveCorba()`
`39`	`40`	`{`
`@@ -52,7 +53,8 @@ extern void Corba_setSessionName(const char* _inSessionName)`
`52`	`53`
`53`	`54`	`extern const char* Corba_waitForCommand()`
`54`	`55`	`{`
`55`		`- return strdup(CorbaImpl__waitForCommand());`
	`56`	`+ const char *res = CorbaImpl__waitForCommand();`
	`57`	`+ return strcpy(ModelicaAllocateString(strlen(res)), res);`
`56`	`58`	`}`
`57`	`59`
`58`	`60`	`extern void Corba_initialize()`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ extern "C" {`
`41`	`41`	`#include "rml_compatibility.h"`
`42`	`42`	`#include "OpenModelicaBootstrappingHeader.h"`
`43`	`43`	`#include "Dynload.cpp"`
	`44`	`+#include "ModelicaUtilities.h"`
`44`	`45`
`45`	`46`	`extern void* DynLoad_executeFunction(int _inFuncHandle, void* _inValLst, int _inPrintDebug)`
`46`	`47`	`{`
`@@ -59,7 +60,7 @@ extern void* omc_Absyn_pathString2(void,void);`
`59`	`60`	`static const char* path_to_name(void* path, char del)`
`60`	`61`	`{`
`61`	`62`	`char delStr[2] = {del,'\0'};`
`62`		`- return strdup(MMC_STRINGDATA(omc_Absyn_pathString2(path, mmc_mk_scon(delStr))));`
	`63`	`+ return MMC_STRINGDATA(omc_Absyn_pathString2(path, mmc_mk_scon(delStr)));`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,13 +68,13 @@ extern void* Error_getMessages()`
`68`	`68`	`extern const char* Error_printErrorsNoWarning()`
`69`	`69`	`{`
`70`	`70`	`std::string res = ErrorImpl__printErrorsNoWarning();`
`71`		`- return MMC_STRINGDATA(mmc_mk_scon(res.c_str()));`
	`71`	`+ return strcpy(ModelicaAllocateString(res.size()), res.c_str());`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`extern const char* Error_printMessagesStr()`
`75`	`75`	`{`
`76`	`76`	`std::string res = ErrorImpl__printMessagesStr();`
`77`		`- return MMC_STRINGDATA(mmc_mk_scon(res.c_str()));`
	`77`	`+ return strcpy(ModelicaAllocateString(res.size()), res.c_str());`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`extern void Error_addSourceMessage(int _id, void msg_type, void severity, int _sline, int _scol, int _eline, int _ecol, int _read_only, const char* _filename, const char* _msg, void* tokenlst)`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`	`#include "meta_modelica.h"`
`34`	`34`
`35`	`35`	`#include "printimpl.c"`
	`36`	`+#include "ModelicaUtilities.h"`
`36`	`37`
`37`	`38`	`extern int Print_saveAndClearBuf()`
`38`	`39`	`{`
`@@ -76,15 +77,15 @@ extern const char* Print_getString(void)`
`76`	`77`	`if (res == NULL)`
`77`	`78`	`MMC_THROW();`
`78`	`79`	`// fprintf(stderr, "Print_getString: %s##\n", res);fflush(NULL);`
`79`		`- return res; // strdup(res);`
	`80`	`+ return strcpy(ModelicaAllocateString(strlen(res)), res);`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`extern const char* Print_getErrorString(void)`
`83`	`84`	`{`
`84`	`85`	`const char* res = PrintImpl__getErrorString();`
`85`	`86`	`if (res == NULL)`
`86`	`87`	`MMC_THROW();`
`87`		`- return res; // strdup(res);`
	`88`	`+ return strcpy(ModelicaAllocateString(strlen(res)), res);`
`88`	`89`	`}`
`89`	`90`
`90`	`91`	`extern void Print_clearErrorBuf(void)`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@`
`35`	`35`	`#endif`
`36`	`36`
`37`	`37`	`#include "meta_modelica.h"`
	`38`	`+#include "ModelicaUtilities.h"`
`38`	`39`
`39`	`40`	`extern "C" {`
`40`	`41`
`@@ -45,7 +46,7 @@ extern const char* Settings_getInstallationDirectoryPath()`
`45`	`46`	`const char *path = SettingsImpl__getInstallationDirectoryPath();`
`46`	`47`	`if (path == NULL)`
`47`	`48`	`MMC_THROW();`
`48`		`- return strdup(path);`
	`49`	`+ return strcpy(ModelicaAllocateString(strlen(path)), path);`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`extern const char* Settings_getModelicaPath(int runningTestsuite)`
`@@ -58,7 +59,8 @@ extern const char* Settings_getModelicaPath(int runningTestsuite)`
`58`	`59`
`59`	`60`	`extern const char* Settings_getCompileCommand()`
`60`	`61`	`{`
`61`		`- return strdup(SettingsImpl__getCompileCommand());`
	`62`	`+ const char *res = SettingsImpl__getCompileCommand();`
	`63`	`+ return strcpy(ModelicaAllocateString(strlen(res)), res);`
`62`	`64`	`}`
`63`	`65`
`64`	`66`	`extern void Settings_setPlotCommand(const char* _inString);`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ extern "C"`
`44`	`44`	`#include "openmodelica.h"`
`45`	`45`	`#include "meta_modelica.h"`
`46`	`46`	`#include "rml_compatibility.h"`
	`47`	`+#include "ModelicaUtilities.h"`
`47`	`48`	`#define ADD_METARECORD_DEFINTIONS static`
`48`	`49`	`#include "OpenModelicaBootstrappingHeader.h"`
`49`	`50`	`#include "systemimpl.c"`
`@@ -93,7 +94,7 @@ extern const char* System_stringFindString(const char* str, const char* searchSt`
`93`	`94`	`const char *found = strstr(str, searchStr);`
`94`	`95`	`if (found == NULL)`
`95`	`96`	`MMC_THROW();`
`96`		`- return strdup(found);`
	`97`	`+ return strcpy(ModelicaAllocateString(strlen(found)), found);`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`extern void System_realtimeTick(int ix)`
`@@ -127,27 +128,27 @@ extern const char* System_getRTLibs()`
`127`	`128`
`128`	`129`	`extern const char* System_getCCompiler()`
`129`	`130`	`{`
`130`		`- return strdup(cc);`
	`131`	`+ return strcpy(ModelicaAllocateString(strlen(cc)), cc);`
`131`	`132`	`}`
`132`	`133`
`133`	`134`	`extern const char* System_getCXXCompiler()`
`134`	`135`	`{`
`135`		`- return strdup(cxx);`
	`136`	`+ return strcpy(ModelicaAllocateString(strlen(cxx)), cxx);`
`136`	`137`	`}`
`137`	`138`
`138`	`139`	`extern const char* System_getLinker()`
`139`	`140`	`{`
`140`		`- return strdup(linker);`
	`141`	`+ return strcpy(ModelicaAllocateString(strlen(linker)), linker);`
`141`	`142`	`}`
`142`	`143`
`143`	`144`	`extern const char* System_getLDFlags()`
`144`	`145`	`{`
`145`		`- return strdup(ldflags);`
	`146`	`+ return strcpy(ModelicaAllocateString(strlen(ldflags)), ldflags);`
`146`	`147`	`}`
`147`	`148`
`148`	`149`	`extern const char* System_getCFlags()`
`149`	`150`	`{`
`150`		`- return strdup(cflags);`
	`151`	`+ return strcpy(ModelicaAllocateString(strlen(cflags)), cflags);`
`151`	`152`	`}`
`152`	`153`
`153`	`154`	`extern const char* System_getExeExt()`
`@@ -184,7 +185,8 @@ extern const char* System_trimChar(const char* str, const char* char_to_remove)`
`184`	`185`
`185`	`186`	`extern const char* System_basename(const char* str)`
`186`	`187`	`{`
`187`		`- return strdup(SystemImpl__basename(str));`
	`188`	`+ char *res = SystemImpl__basename(str);`
	`189`	`+ return strcpy(ModelicaAllocateString(strlen(res)), res);`
`188`	`190`	`}`
`189`	`191`
`190`	`192`	`extern const char* System_dirname(const char* str)`
`@@ -195,10 +197,11 @@ extern const char* System_dirname(const char* str)`
`195`	`197`	`char drive[_MAX_DRIVE], dir[_MAX_DIR], filename[_MAX_FNAME], extension[_MAX_EXT];`
`196`	`198`	`_splitpath(str, drive, dir, filename, extension);`
`197`	`199`	`sprintf(cpy, "%s/%s/",drive,dir);`
`198`		`- res = strdup(cpy);`
	`200`	`+ res = cpy;`
`199`	`201`	`#else`
`200`		`- res = strdup(dirname(cpy));`
	`202`	`+ res = dirname(cpy);`
`201`	`203`	`#endif`
	`204`	`+ res = strcpy(ModelicaAllocateString(strlen(res)), res);`
`202`	`205`	`free(cpy);`
`203`	`206`	`return res;`
`204`	`207`	`}`
`@@ -347,7 +350,7 @@ extern char* System_substring(const char *str, int start, int stop)`
`347`	`350`	`extern char* System_toupper(const char *str)`
`348`	`351`	`{`
`349`	`352`	`int i;`
`350`		`- char* strToUpper = strdup(str);`
	`353`	`+ char* strToUpper = strcpy(ModelicaAllocateString(strlen(str)),str);`
`351`	`354`	`for (i = 0; i < strlen(strToUpper); i++)`
`352`	`355`	`{`
`353`	`356`	`strToUpper[i] = toupper(strToUpper[i]);`
`@@ -358,7 +361,7 @@ extern char* System_toupper(const char *str)`
`358`	`361`	`extern char* System_tolower(const char *str)`
`359`	`362`	`{`
`360`	`363`	`int i;`
`361`		`- char* strToLower = strdup(str);`
	`364`	`+ char* strToLower = strcpy(ModelicaAllocateString(strlen(str)),str);`
`362`	`365`	`for (i = 0; i < strlen(strToLower); i++)`
`363`	`366`	`{`
`364`	`367`	`strToLower[i] = tolower(strToLower[i]);`
`@@ -369,7 +372,7 @@ extern char* System_tolower(const char *str)`
`369`	`372`	`const char* System_getClassnamesForSimulation()`
`370`	`373`	`{`
`371`	`374`	`if(class_names_for_simulation)`
`372`		`- return strdup(class_names_for_simulation);`
	`375`	`+ return strcpy(ModelicaAllocateString(strlen(class_names_for_simulation)),class_names_for_simulation);`
`373`	`376`	`else`
`374`	`377`	`return "{}";`
`375`	`378`	`}`
`@@ -469,7 +472,7 @@ extern const char* System_readEnv(const char *envname)`
`469`	`472`	`{`
`470`	`473`	`char *envvalue = getenv(envname);`
`471`	`474`	`if (envvalue == NULL) MMC_THROW();`
`472`		`- return strdup(envvalue);`
	`475`	`+ return strcpy(ModelicaAllocateString(strlen(envvalue)),envvalue);`
`473`	`476`	`}`
`474`	`477`
`475`	`478`	`extern void System_getCurrentDateTime(int* sec, int* min, int* hour, int* mday, int* mon, int* year)`
`@@ -488,7 +491,8 @@ extern void System_getCurrentDateTime(int* sec, int* min, int* hour, int* mday,`
`488`	`491`
`489`	`492`	`extern const char* System_getUUIDStr()`
`490`	`493`	`{`
`491`		`- return strdup(SystemImpl__getUUIDStr());`
	`494`	`+ char *res = SystemImpl__getUUIDStr();`
	`495`	`+ return strcpy(ModelicaAllocateString(strlen(res)),res);`
`492`	`496`	`}`
`493`	`497`
`494`	`498`	`extern int System_loadLibrary(const char *name, int printDebug)`
`@@ -672,7 +676,9 @@ extern void System_getLoadModelPath(const char className, void prios, void *mp`
`672`	`676`	`{`
`673`	`677`	`*name = NULL;`
`674`	`678`	`if (SystemImpl__getLoadModelPath(className,prios,mps,dir,name,isDir)) MMC_THROW();`
`675`		`- /* TODO: Do not strdup in parent... */`
	`679`	`+ char *res = strcpy(ModelicaAllocateString(strlen(name)),name);`
	`680`	`+ free(*name);`
	`681`	`+ *name = res;`
`676`	`682`	`}`
`677`	`683`
`678`	`684`	`extern const char* System_getMakeCommand()`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`/* External interface for UnitParserExt module */`
`2`	`2`	`#include "unitparser.h"`
`3`	`3`	`#include "unitparserext.cpp"`
	`4`	`+#include "ModelicaUtilities.h"`
`4`	`5`
`5`	`6`	`extern "C"`
`6`	`7`	`{`
`@@ -34,7 +35,7 @@ const char* UnitParserExt_unit2str(void nums, void denoms, void *tpnoms, void`
`34`	`35`	`//string res = unitParser->unit2str(unit);`
`35`	`36`	`string res = unitParser->prettyPrintUnit2str(unit);`
`36`	`37`
`37`		`- return strdup(res.c_str());`
	`38`	`+ return strcpy(ModelicaAllocateString(res.size()), res.c_str());`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`void UnitParserExt_str2unit(const char inStr, void nums, void denoms, void tpnoms, void tpdenoms, void *tpstrs)`