Changeset 788e3efa in OpenModelica

Timestamp:

2013-02-27T14:59:56+01:00 (11 years ago)

Author:

Martin Sjölund <martin.sjolund@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

e4eb8d4

Parents:

e5b28d39

Message:

• Added a nice little signal handler that can gracefully recover from stack overflows, but causes other segmentation faults to make the executable die.
• Only implemented for the main function of the bootstrapped compiler. We will need to use some more code to make omc recover from a failed CORBA command or model instantiation, etc.

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

Location:

SimulationRuntime/c

Files:

• Makefile.common (modified) (1 diff)
• meta/meta_modelica.h (modified) (2 diffs)
• meta/meta_modelica_segv.c (added)
• meta/meta_modelica_segv.h (added)

SimulationRuntime/c/Makefile.common

@@ -25 +25 @@
 ./meta/meta_modelica.h \
 ./meta/meta_modelica_real.h \
+./meta/meta_modelica_segv.h \
 ./meta/meta_modelica_string_lit.h \
 ./openmodelica_func.h \

SimulationRuntime/c/meta/meta_modelica.h

@@ -47 +47 @@
 #include "meta_modelica_string_lit.h"
 #include "meta_modelica_builtin.h"
+#include "meta_modelica_segv.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -632 +633 @@
 */
 extern jmp_buf *mmc_jumper;
-#define MMC_TRY() { jmp_buf new_mmc_jumper, *old_jumper; old_jumper = mmc_jumper; mmc_jumper = &new_mmc_jumper; if (setjmp(new_mmc_jumper) == 0) {
+#define MMC_TRY_INTERNAL(X) { jmp_buf new_mmc_jumper, *old_jumper; old_jumper = X; X = &new_mmc_jumper; if (setjmp(new_mmc_jumper) == 0) {
+#define MMC_TRY() MMC_TRY_INTERNAL(mmc_jumper)
+
 #if !defined(_MSC_VER)
-#define MMC_CATCH() } mmc_jumper = old_jumper; mmc_GC_unwind_roots_state(mmc_GC_local_state); mmc_catch_dummy_fn();}
+#define MMC_CATCH_INTERNAL(X) } X = old_jumper; mmc_GC_unwind_roots_state(mmc_GC_local_state); mmc_catch_dummy_fn();}
 #else
-#define MMC_CATCH() } mmc_jumper = old_jumper; mmc_GC_unwind_roots_state(mmc_GC_local_state);}
-#endif
+#define MMC_CATCH_INTERNAL(X) } X = old_jumper; mmc_GC_unwind_roots_state(mmc_GC_local_state);}
+#endif
+#define MMC_CATCH() MMC_CATCH_INTERNAL(mmc_jumper)
+
 #define MMC_THROW() longjmp(*mmc_jumper,1)
 #define MMC_ELSE() } else {