summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2016-11-18 21:12:50 -0800
committerKeith Packard <keithp@keithp.com>2016-11-18 21:12:50 -0800
commitae2f70e6162b99de40155ff9f12ee2396cd7802c (patch)
tree1e82768c8fc20eae17021a3200cc0c997a6fb899
parent8bf6b8989a4f365467fae38a03570d277f362ac2 (diff)
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>
-rw-r--r--src/lisp/ao_lisp.h8
-rw-r--r--src/lisp/ao_lisp_eval.c1
-rw-r--r--src/lisp/ao_lisp_lambda.c1
3 files changed, 7 insertions, 3 deletions
diff --git a/src/lisp/ao_lisp.h b/src/lisp/ao_lisp.h
index a8e1715a..cea834fc 100644
--- 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 2460a32a..3be7c9c4 100644
--- 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 656936cb..67ad24ee 100644
--- 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