projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
telegps-v2.0: Remove fec_tx code and ADC logging.
[fw/altos]
/
src
/
lisp
/
ao_lisp_atom.c
diff --git
a/src/lisp/ao_lisp_atom.c
b/src/lisp/ao_lisp_atom.c
index ea04741e2b2c01c7201f85cc49e0fc99af7102dd..8c9e8ed11346ae5062c3f601ba38b6406f91233d 100644
(file)
--- a/
src/lisp/ao_lisp_atom.c
+++ b/
src/lisp/ao_lisp_atom.c
@@
-17,12
+17,6
@@
#include "ao_lisp.h"
#include "ao_lisp.h"
-#if 0
-#define DBG(...) printf(__VA_ARGS__)
-#else
-#define DBG(...)
-#endif
-
static int name_size(char *name)
{
return sizeof(struct ao_lisp_atom) + strlen(name) + 1;
static int name_size(char *name)
{
return sizeof(struct ao_lisp_atom) + strlen(name) + 1;
@@
-40,44
+34,39
@@
static void atom_mark(void *addr)
{
struct ao_lisp_atom *atom = addr;
{
struct ao_lisp_atom *atom = addr;
- DBG ("\tatom start %s\n", atom->name);
for (;;) {
atom = ao_lisp_poly_atom(atom->next);
if (!atom)
break;
for (;;) {
atom = ao_lisp_poly_atom(atom->next);
if (!atom)
break;
- DBG("\t\tatom mark %s %d\n", atom->name, (uint8_t *) atom - ao_lisp_const);
- if (ao_lisp_mark_memory(atom, atom_size(atom)))
+ if (ao_lisp_mark_memory(&ao_lisp_atom_type, atom))
break;
}
break;
}
- DBG ("\tatom done\n");
}
static void atom_move(void *addr)
{
struct ao_lisp_atom *atom = addr;
}
static void atom_move(void *addr)
{
struct ao_lisp_atom *atom = addr;
+ int ret;
- DBG("\tatom move start %s %d next %s %d\n",
- atom->name, ((uint8_t *) atom - ao_lisp_const),
- atom->next ? ao_lisp_poly_atom(atom->next)->name : "(none)",
- atom->next ? ((uint8_t *) ao_lisp_poly_atom(atom->next) - ao_lisp_const) : 0);
for (;;) {
for (;;) {
- struct ao_lisp_atom
*next
;
+ struct ao_lisp_atom
*next = ao_lisp_poly_atom(atom->next)
;
- next = ao_lisp_poly_atom(atom->next);
- next = ao_lisp_move_memory(next, atom_size(next));
if (!next)
break;
if (!next)
break;
- DBG("\t\tatom move %s %d->%d\n", next->name, ((uint8_t *) ao_lisp_poly_atom(atom->next) - ao_lisp_const), ((uint8_t *) next - ao_lisp_const));
- atom->next = ao_lisp_atom_poly(next);
+ ret = ao_lisp_move_memory(&ao_lisp_atom_type, (void **) &next);
+ if (next != ao_lisp_poly_atom(atom->next))
+ atom->next = ao_lisp_atom_poly(next);
+ if (ret)
+ break;
atom = next;
}
atom = next;
}
- DBG("\tatom move end\n");
}
const struct ao_lisp_type ao_lisp_atom_type = {
.mark = atom_mark,
.size = atom_size,
.move = atom_move,
}
const struct ao_lisp_type ao_lisp_atom_type = {
.mark = atom_mark,
.size = atom_size,
.move = atom_move,
+ .name = "atom"
};
struct ao_lisp_atom *ao_lisp_atoms;
};
struct ao_lisp_atom *ao_lisp_atoms;
@@
-97,32
+86,29
@@
ao_lisp_atom_intern(char *name)
return atom;
}
#endif
return atom;
}
#endif
+ ao_lisp_string_stash(0, name);
atom = ao_lisp_alloc(name_size(name));
atom = ao_lisp_alloc(name_size(name));
+ name = ao_lisp_string_fetch(0);
if (atom) {
atom->type = AO_LISP_ATOM;
atom->next = ao_lisp_atom_poly(ao_lisp_atoms);
if (atom) {
atom->type = AO_LISP_ATOM;
atom->next = ao_lisp_atom_poly(ao_lisp_atoms);
- if (!ao_lisp_atoms)
- ao_lisp_root_add(&ao_lisp_atom_type, &ao_lisp_atoms);
ao_lisp_atoms = atom;
strcpy(atom->name, name);
}
return atom;
}
ao_lisp_atoms = atom;
strcpy(atom->name, name);
}
return atom;
}
-st
atic struct ao_lisp_frame
*ao_lisp_frame_global;
-struct ao_lisp_frame
*ao_lisp_frame_current;
+st
ruct ao_lisp_frame
*ao_lisp_frame_global;
+struct ao_lisp_frame *ao_lisp_frame_current;
static void
ao_lisp_atom_init(void)
{
static void
ao_lisp_atom_init(void)
{
- if (!ao_lisp_frame_global) {
- ao_lisp_frame_global = ao_lisp_frame_new(0, 0);
- ao_lisp_root_add(&ao_lisp_frame_type, &ao_lisp_frame_global);
- ao_lisp_root_add(&ao_lisp_frame_type, &ao_lisp_frame_current);
- }
+ if (!ao_lisp_frame_global)
+ ao_lisp_frame_global = ao_lisp_frame_new(0);
}
}
-
static
ao_poly *
+ao_poly *
ao_lisp_atom_ref(struct ao_lisp_frame *frame, ao_poly atom)
{
ao_poly *ref;
ao_lisp_atom_ref(struct ao_lisp_frame *frame, ao_poly atom)
{
ao_poly *ref;
@@
-131,7
+117,7
@@
ao_lisp_atom_ref(struct ao_lisp_frame *frame, ao_poly atom)
ref = ao_lisp_frame_ref(frame, atom);
if (ref)
return ref;
ref = ao_lisp_frame_ref(frame, atom);
if (ref)
return ref;
- frame = ao_lisp_poly_frame(frame->
next
);
+ frame = ao_lisp_poly_frame(frame->
prev
);
}
if (ao_lisp_frame_global) {
ref = ao_lisp_frame_ref(ao_lisp_frame_global, atom);
}
if (ao_lisp_frame_global) {
ref = ao_lisp_frame_ref(ao_lisp_frame_global, atom);
@@
-154,7
+140,7
@@
ao_lisp_atom_get(ao_poly atom)
#endif
if (ref)
return *ref;
#endif
if (ref)
return *ref;
- return
AO_LISP_NIL
;
+ return
ao_lisp_error(AO_LISP_UNDEFINED, "undefined atom %s", ao_lisp_poly_atom(atom)->name)
;
}
ao_poly
}
ao_poly
@@
-167,7
+153,7
@@
ao_lisp_atom_set(ao_poly atom, ao_poly val)
if (ref)
*ref = val;
else
if (ref)
*ref = val;
else
- ao_lisp_frame_
global = ao_lisp_frame_add(
ao_lisp_frame_global, atom, val);
+ ao_lisp_frame_
add(&
ao_lisp_frame_global, atom, val);
return val;
}
return val;
}