altos/lisp: Split out read debug, add memory validation

[fw/altos] / src / lisp / ao_lisp_error.c

diff --git a/src/lisp/ao_lisp_error.c b/src/lisp/ao_lisp_error.c
index 2b15c4184c99f4ef24565366fcc2cde93166e90b..7f9094879e7ad9241273c6a635c52592f3792f42 100644 (file)
--- a/src/lisp/ao_lisp_error.c
+++ b/src/lisp/ao_lisp_error.c
@@ -15,24 +15,32 @@
 #include "ao_lisp.h"
 #include <stdarg.h>
 
-static void
-ao_lisp_error_cons(char *name, struct ao_lisp_cons *cons)
+void
+ao_lisp_error_poly(char *name, ao_poly poly, ao_poly last)
 {
        int first = 1;
        printf("\t\t%s(", name);
-       if (cons) {
-               while (cons) {
-                       if (!first)
-                               printf("\t\t         ");
-                       else
-                               first = 0;
-                       ao_lisp_poly_print(cons->car);
-                       printf("\n");
-                       cons = ao_lisp_poly_cons(cons->cdr);
-               }
-               printf("\t\t         )\n");
-       } else
-               printf(")\n");
+       if (ao_lisp_poly_type(poly) == AO_LISP_CONS) {
+               if (poly) {
+                       while (poly) {
+                               struct ao_lisp_cons *cons = ao_lisp_poly_cons(poly);
+                               if (!first)
+                                       printf("\t\t         ");
+                               else
+                                       first = 0;
+                               ao_lisp_poly_write(cons->car);
+                               printf("\n");
+                               if (poly == last)
+                                       break;
+                               poly = cons->cdr;
+                       }
+                       printf("\t\t         )\n");
+               } else
+                       printf(")\n");
+       } else {
+               ao_lisp_poly_write(poly);
+               printf("\n");
+       }
 }
 
 static void tabs(int indent)
@@ -41,7 +49,7 @@ static void tabs(int indent)
                printf("\t");
 }
 
-static void
+void
 ao_lisp_error_frame(int indent, char *name, struct ao_lisp_frame *frame)
 {
        int                     f;
@@ -49,52 +57,69 @@ ao_lisp_error_frame(int indent, char *name, struct ao_lisp_frame *frame)
        tabs(indent);
        printf ("%s{", name);
        if (frame) {
-               for (f = 0; f < ao_lisp_frame_num(frame); f++) {
-                       if (f != 0) {
-                               tabs(indent);
-                               printf("         ");
+               struct ao_lisp_frame_vals       *vals = ao_lisp_poly_frame_vals(frame->vals);
+               if (frame->type & AO_LISP_FRAME_PRINT)
+                       printf("recurse...");
+               else {
+                       frame->type |= AO_LISP_FRAME_PRINT;
+                       for (f = 0; f < frame->num; f++) {
+                               if (f != 0) {
+                                       tabs(indent);
+                                       printf("         ");
+                               }
+                               ao_lisp_poly_write(vals->vals[f].atom);
+                               printf(" = ");
+                               ao_lisp_poly_write(vals->vals[f].val);
+                               printf("\n");
                        }
-                       ao_lisp_poly_print(frame->vals[f].atom);
-                       printf(" = ");
-                       ao_lisp_poly_print(frame->vals[f].val);
-                       printf("\n");
+                       if (frame->prev)
+                               ao_lisp_error_frame(indent + 1, "prev:   ", ao_lisp_poly_frame(frame->prev));
+                       frame->type &= ~AO_LISP_FRAME_PRINT;
                }
-               if (frame->prev)
-                       ao_lisp_error_frame(indent + 1, "prev:   ", ao_lisp_poly_frame(frame->prev));
-       }
-       tabs(indent);
-       printf("        }\n");
+               tabs(indent);
+               printf("        }\n");
+       } else
+               printf ("}\n");
 }
 
-static const char *state_names[] = {
-       "sexpr",
-       "val",
-       "formal",
-       "exec",
-       "cond",
-       "cond_test",
-       "progn",
-};
-
 void
-ao_lisp_stack_print(void)
+ao_lisp_vprintf(char *format, va_list args)
 {
-       struct ao_lisp_stack *s;
-       printf("Value:  "); ao_lisp_poly_print(ao_lisp_v); printf("\n");
-       printf("Stack:\n");
-       for (s = ao_lisp_stack; s; s = ao_lisp_poly_stack(s->prev)) {
-               printf("\t[\n");
-               printf("\t\texpr:   "); ao_lisp_poly_print(s->list); printf("\n");
-               printf("\t\tstate:  %s\n", state_names[s->state]);
-//             printf("\t\tmacro:  %s\n", s->macro ? "true" : "false");
-               ao_lisp_error_cons ("sexprs: ", ao_lisp_poly_cons(s->sexprs));
-               ao_lisp_error_cons ("values: ", ao_lisp_poly_cons(s->values));
-               ao_lisp_error_frame(2, "frame:  ", ao_lisp_poly_frame(s->frame));
-//             ao_lisp_error_frame(2, "mframe: ", ao_lisp_poly_frame(s->macro_frame));
-               printf("\t]\n");
+       char c;
+
+       while ((c = *format++) != '\0') {
+               if (c == '%') {
+                       switch (c = *format++) {
+                       case 'v':
+                               ao_lisp_poly_write((ao_poly) va_arg(args, unsigned int));
+                               break;
+                       case 'p':
+                               printf("%p", va_arg(args, void *));
+                               break;
+                       case 'd':
+                               printf("%d", va_arg(args, int));
+                               break;
+                       case 's':
+                               printf("%s", va_arg(args, char *));
+                               break;
+                       default:
+                               putchar(c);
+                               break;
+                       }
+               } else
+                       putchar(c);
        }
 }
 
+void
+ao_lisp_printf(char *format, ...)
+{
+       va_list args;
+       va_start(args, format);
+       ao_lisp_vprintf(format, args);
+       va_end(args);
+}
+
 ao_poly
 ao_lisp_error(int error, char *format, ...)
 {
@@ -102,9 +127,13 @@ ao_lisp_error(int error, char *format, ...)
 
        ao_lisp_exception |= error;
        va_start(args, format);
-       vprintf(format, args);
+       ao_lisp_vprintf(format, args);
+       putchar('\n');
        va_end(args);
-       printf("\n");
-       ao_lisp_stack_print();
+       ao_lisp_printf("Value:  %v\n", ao_lisp_v);
+       ao_lisp_printf("Frame:  %v\n", ao_lisp_frame_poly(ao_lisp_frame_current));
+       printf("Stack:\n");
+       ao_lisp_stack_write(ao_lisp_stack_poly(ao_lisp_stack));
+       ao_lisp_printf("Globals: %v\n", ao_lisp_frame_poly(ao_lisp_frame_global));
        return AO_LISP_NIL;
 }