altos/lisp: Make DBG settings global

This avoids having different values in different files, which wasn't useful.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/lisp/ao_lisp.h b/src/lisp/ao_lisp.h
index a8e1715a8dc88bd3ca8cc4e79e5823b4b3561efc..cea834fcd03a161a78c0e0f467741ebaf568717a 100644 (file)
--- a/src/lisp/ao_lisp.h
+++ b/src/lisp/ao_lisp.h
@@ -15,6 +15,9 @@
 #ifndef _AO_LISP_H_
 #define _AO_LISP_H_
 
+#define DBG_MEM                0
+#define DBG_EVAL       0
+
 #include <stdint.h>
 #include <string.h>
 //#include <stdio.h>
@@ -326,6 +329,10 @@ ao_lisp_poly_other(ao_poly poly) {
 
 static inline uint8_t
 ao_lisp_other_type(void *other) {
+#if DBG_MEM
+       if ((*((uint8_t *) other) & AO_LISP_OTHER_TYPE_MASK) >= AO_LISP_NUM_TYPE)
+               ao_lisp_abort();
+#endif
        return *((uint8_t *) other) & AO_LISP_OTHER_TYPE_MASK;
 }
 
@@ -743,7 +750,6 @@ ao_lisp_frames_dump(void)
 #define DBG_FRAMES()
 #endif
 
-#define DBG_MEM                0
 #define DBG_MEM_START  1
 
 #if DBG_MEM

diff --git a/src/lisp/ao_lisp_eval.c b/src/lisp/ao_lisp_eval.c
index 2460a32a3a8e9f6dc18002d21ba3f1f4e91df237..3be7c9c4fa68c2fb29b60ec6f8b10ec6216ae705 100644 (file)
--- a/src/lisp/ao_lisp_eval.c
+++ b/src/lisp/ao_lisp_eval.c
@@ -12,7 +12,6 @@
  * General Public License for more details.
  */
 
-#define DBG_EVAL 0
 #include "ao_lisp.h"
 #include <assert.h>
 

diff --git a/src/lisp/ao_lisp_lambda.c b/src/lisp/ao_lisp_lambda.c
index 656936cb88c691b10077b5543fb2693d56dfbe34..67ad24ee69296942dc0e8a240eee8c9d0e84ef66 100644 (file)
--- a/src/lisp/ao_lisp_lambda.c
+++ b/src/lisp/ao_lisp_lambda.c
@@ -15,7 +15,6 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-#define DBG_EVAL 0
 #include "ao_lisp.h"
 
 int