Doc fixes.

[bertos.git] / mware / except.h

diff --git a/mware/except.h b/mware/except.h
old mode 100755 (executable)
new mode 100644 (file)
index fc7f142..b78435d
--- a/mware/except.h
+++ b/mware/except.h
@@ -1,9 +1,34 @@
 /**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2006 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999 Bernardo Innocenti <bernie@develer.com>
- * This file is part of DevLib - See README.devlib for information.
+ *
  * -->
  *
  * \brief C++-like structured exception handling for C programs
@@ -32,15 +57,9 @@
 extern jmp_buf except_stack[EXCEPT_CONTEXTS];
 extern int except_top;
 
-#ifdef _DEBUG
-#      define PUSH_ABORT       ASSERT(abort_top < ABORT_CONTEXTS), setjmp(abort_stack[abort_top++]))
-#      define POP_ABORT        (ASSERT(abort_top > 0), --abort_top)
-#      define DO_ABORT         (ASSERT(abort_top > 0), longjmp(abort_stack[--abort_top], true))
-#else
-#      define PUSH_ABORT       (setjmp(abort_stack[abort_top++]))
-#      define POP_ABORT        (--abort_top)
-#      define DO_ABORT         (longjmp(abort_stack[--abort_top], true))
-#endif
+#define PUSH_EXCEPT    (ASSERT(except_top < EXCEPT_CONTEXTS), setjmp(except_stack[except_top++]))
+#define POP_EXCEPT     (ASSERT(except_top > 0), --except_top)
+#define DO_EXCEPT      (ASSERT(except_top > 0), longjmp(except_stack[--except_top], true))
 
 /**
  * Jump buffer to use when throwing an exception or aborting an operation
@@ -92,15 +111,15 @@ extern int except_top;
  *    EXCEPT_DEFINE;
  * \endcode
  */
-#define TRY          if (PUSH_ABORT) { {
-#define TRY_END      } POP_ABORT; }
-#define CATCH        } POP_ABORT; } else {
+#define TRY          if (PUSH_EXCEPT) { {
+#define TRY_END      } POP_EXCEPT; }
+#define CATCH        } POP_EXCEPT; } else {
 #define CATCH_END    }
-#define THROW        DO_ABORT
+#define THROW        DO_EXCEPT
 
 
 #define EXCEPT_DEFINE \
-       jmp_buf abort_stack[ABORT_CONTEXTS]; \
-       int abort_top;
+       jmp_buf except_stack[EXCEPT_CONTEXTS]; \
+       int except_top;
 
 #endif /* MWARE_EXCEPT_H */