altos/telegps-v2.0: git ignore make results

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

diff --git a/src/lisp/ao_lisp_frame.c b/src/lisp/ao_lisp_frame.c
index 052d27d7246f83228de8c9a9d5785cc39eced6de..05f6d253ca23159fee0413c516e32cbbc9be0c8d 100644 (file)
--- a/src/lisp/ao_lisp_frame.c
+++ b/src/lisp/ao_lisp_frame.c
@@ -24,7 +24,7 @@ static int
 frame_size(void *addr)
 {
        struct ao_lisp_frame    *frame = addr;
-       return frame_num_size(ao_lisp_frame_num(frame));
+       return frame_num_size(frame->num);
 }
 
 static void
@@ -37,7 +37,7 @@ frame_mark(void *addr)
                MDBG_MOVE("frame mark %d\n", MDBG_OFFSET(frame));
                if (!AO_LISP_IS_POOL(frame))
                        break;
-               for (f = 0; f < ao_lisp_frame_num(frame); f++) {
+               for (f = 0; f < frame->num; f++) {
                        struct ao_lisp_val      *v = &frame->vals[f];
 
                        ao_lisp_poly_mark(v->val, 0);
@@ -68,7 +68,7 @@ frame_move(void *addr)
                MDBG_MOVE("frame move %d\n", MDBG_OFFSET(frame));
                if (!AO_LISP_IS_POOL(frame))
                        break;
-               for (f = 0; f < ao_lisp_frame_num(frame); f++) {
+               for (f = 0; f < frame->num; f++) {
                        struct ao_lisp_val      *v = &frame->vals[f];
 
                        ao_lisp_poly_move(&v->atom, 0);
@@ -109,27 +109,51 @@ ao_lisp_frame_print(ao_poly p)
 
        printf ("{");
        if (frame) {
-               for (f = 0; f < ao_lisp_frame_num(frame); f++) {
-                       if (f != 0)
-                               printf(", ");
-                       ao_lisp_poly_print(frame->vals[f].atom);
-                       printf(" = ");
-                       ao_lisp_poly_print(frame->vals[f].val);
+               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)
+                                       printf(", ");
+                               ao_lisp_poly_print(frame->vals[f].atom);
+                               printf(" = ");
+                               ao_lisp_poly_print(frame->vals[f].val);
+                       }
+                       if (frame->prev)
+                               ao_lisp_poly_print(frame->prev);
+                       frame->type &= ~AO_LISP_FRAME_PRINT;
                }
-               if (frame->prev)
-                       ao_lisp_poly_print(frame->prev);
        }
        printf("}");
 }
 
+static int
+ao_lisp_frame_find(struct ao_lisp_frame *frame, int top, ao_poly atom)
+{
+       int l = 0;
+       int r = top - 1;
+       while (l <= r) {
+               int m = (l + r) >> 1;
+               if (frame->vals[m].atom < atom)
+                       l = m + 1;
+               else
+                       r = m - 1;
+       }
+       return l;
+}
+
 ao_poly *
 ao_lisp_frame_ref(struct ao_lisp_frame *frame, ao_poly atom)
 {
-       int f;
-       for (f = 0; f < ao_lisp_frame_num(frame); f++)
-               if (frame->vals[f].atom == atom)
-                       return &frame->vals[f].val;
-       return NULL;
+       int l = ao_lisp_frame_find(frame, frame->num, atom);
+
+       if (l >= frame->num)
+               return NULL;
+
+       if (frame->vals[l].atom != atom)
+               return NULL;
+       return &frame->vals[l].val;
 }
 
 int
@@ -175,7 +199,7 @@ ao_lisp_frame_new(int num)
                        return NULL;
        }
        frame->type = AO_LISP_FRAME;
-       frame->_num = num;
+       frame->num = num;
        frame->prev = AO_LISP_NIL;
        memset(frame->vals, '\0', num * sizeof (struct ao_lisp_val));
        return frame;
@@ -186,9 +210,7 @@ ao_lisp_frame_mark(struct ao_lisp_frame *frame)
 {
        if (!frame)
                return AO_LISP_NIL;
-       if (frame->_num == 0xff)
-               ao_lisp_abort();
-       frame->_num |= AO_LISP_FRAME_MARK;
+       frame->type |= AO_LISP_FRAME_MARK;
        return ao_lisp_frame_poly(frame);
 }
 
@@ -196,7 +218,7 @@ void
 ao_lisp_frame_free(struct ao_lisp_frame *frame)
 {
        if (!ao_lisp_frame_marked(frame)) {
-               int     num = ao_lisp_frame_num(frame);
+               int     num = frame->num;
                if (num < AO_LISP_FRAME_FREE) {
                        frame->prev = ao_lisp_frame_poly(ao_lisp_frame_free_list[num]);
                        ao_lisp_frame_free_list[num] = frame;
@@ -211,7 +233,7 @@ ao_lisp_frame_realloc(struct ao_lisp_frame **frame_ref, int new_num)
        struct ao_lisp_frame    *new;
        int                     copy;
 
-       if (new_num == ao_lisp_frame_num(frame))
+       if (new_num == frame->num)
                return frame;
        new = ao_lisp_frame_new(new_num);
        if (!new)
@@ -222,14 +244,26 @@ ao_lisp_frame_realloc(struct ao_lisp_frame **frame_ref, int new_num)
         */
        frame = *frame_ref;
        copy = new_num;
-       if (copy > ao_lisp_frame_num(frame))
-               copy = ao_lisp_frame_num(frame);
+       if (copy > frame->num)
+               copy = frame->num;
        memcpy(new->vals, frame->vals, copy * sizeof (struct ao_lisp_val));
        new->prev = frame->prev;
        ao_lisp_frame_free(frame);
        return new;
 }
 
+void
+ao_lisp_frame_bind(struct ao_lisp_frame *frame, int num, ao_poly atom, ao_poly val)
+{
+       int l = ao_lisp_frame_find(frame, num, atom);
+
+       memmove(&frame->vals[l+1],
+               &frame->vals[l],
+               (num - l) * sizeof (struct ao_lisp_val));
+       frame->vals[l].atom = atom;
+       frame->vals[l].val = val;
+}
+
 int
 ao_lisp_frame_add(struct ao_lisp_frame **frame_ref, ao_poly atom, ao_poly val)
 {
@@ -241,20 +275,19 @@ ao_lisp_frame_add(struct ao_lisp_frame **frame_ref, ao_poly atom, ao_poly val)
                ao_lisp_poly_stash(0, atom);
                ao_lisp_poly_stash(1, val);
                if (frame) {
-                       f = ao_lisp_frame_num(frame);
+                       f = frame->num;
                        frame = ao_lisp_frame_realloc(frame_ref, f + 1);
                } else {
                        f = 0;
                        frame = ao_lisp_frame_new(1);
                }
-               atom = ao_lisp_poly_fetch(0);
-               val = ao_lisp_poly_fetch(1);
                if (!frame)
                        return 0;
                *frame_ref = frame;
-               frame->vals[f].atom = atom;
-               ref = &frame->vals[f].val;
-       }
-       *ref = val;
+               atom = ao_lisp_poly_fetch(0);
+               val = ao_lisp_poly_fetch(1);
+               ao_lisp_frame_bind(frame, frame->num - 1, atom, val);
+       } else
+               *ref = val;
        return 1;
 }