Repositories / ecl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5bbd889)
Reorganize the code for variable binding for better caching.
authorJuan Jose Garcia Ripoll <jjgarcia@jjgr-2.local>
Wed, 20 Jan 2010 21:55:14 +0000 (22:55 +0100)
committerJuan Jose Garcia Ripoll <jjgarcia@jjgr-2.local>
Wed, 20 Jan 2010 21:55:14 +0000 (22:55 +0100)
src/c/stacks.d patch | blob | blame | history

diff --git a/src/c/stacks.d b/src/c/stacks.d
index 3419074..1b9a3f3 100644 (file)
--- a/src/c/stacks.d
+++ b/src/c/stacks.d
@@ -81,11 +81,7 @@ ecl_bds_bind(cl_env_ptr env, cl_object s, cl_object value)
 {
        cl_object bindings = env->bindings_hash;
        struct ecl_hashtable_entry *h = bindings->hash.get(s, bindings);
-       struct bds_bd *slot = ++env->bds_top;
-       if (slot >= env->bds_limit) {
-               ecl_bds_overflow();
-               slot = env->bds_top;
-       }
+        cl_object old_value;
        if (h->key == OBJNULL) {
                /* The previous binding was at most global */
                cl_index i = bindings->hash.entries + 1;
@@ -96,14 +92,21 @@ ecl_bds_bind(cl_env_ptr env, cl_object s, cl_object value)
                bindings->hash.entries = i;
                h->key = s;
                h->value = value;
-               slot->symbol = s;
-               slot->value = s->symbol.value;
+                old_value = OBJNULL;
        } else {
                /* We have to save a dynamic binding */
-               slot->symbol = h->key;
-               slot->value = h->value;
+                old_value = h->value;
                h->value = value;
        }
+        {
+                struct bds_bd *slot = ++env->bds_top;
+                if (slot >= env->bds_limit) {
+                        ecl_bds_overflow();
+                        slot = env->bds_top;
+                }
+               slot->symbol = s;
+               slot->value = old_value;
+        }
        s->symbol.dynamic |= 1;
 }
 
@@ -112,11 +115,7 @@ ecl_bds_push(cl_env_ptr env, cl_object s)
 {
        cl_object bindings = env->bindings_hash;
        struct ecl_hashtable_entry *h = bindings->hash.get(s, bindings);
-       struct bds_bd *slot = ++env->bds_top;
-       if (slot >= env->bds_limit) {
-               ecl_bds_overflow();
-               slot = env->bds_top;
-       }
+        cl_object old_value;
        if (h->key == OBJNULL) {
                /* The previous binding was at most global */
                cl_index i = bindings->hash.entries + 1;
@@ -127,13 +126,20 @@ ecl_bds_push(cl_env_ptr env, cl_object s)
                bindings->hash.entries = i;
                h->key = s;
                h->value = s->symbol.value;
-               slot->symbol = s;
-                slot->value = OBJNULL;
+                old_value = OBJNULL;
        } else {
                /* We have to save a dynamic binding */
-               slot->symbol = h->key;
-               slot->value = h->value;
+                old_value = h->value;
        }
+        {
+                struct bds_bd *slot = ++env->bds_top;
+                if (slot >= env->bds_limit) {
+                        ecl_bds_overflow();
+                        slot = env->bds_top;
+                }
+               slot->symbol = s;
+               slot->value = old_value;
+        }
        s->symbol.dynamic |= 1;
 }
 
Embeddable Common Lisp (Official: https://gitlab.com/embeddable-common-lisp/ecl)