[git] GnuPG - branch, master, updated. gnupg-2.1.18-36-g49e2ae6
by Justus Winter
cvs at cvs.gnupg.org
Mon Jan 30 18:25:00 CET 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via 49e2ae65e892f93be7f87cfaae3392b50a99e4b1 (commit)
via e343984fc50e87830905614dc87f83f810551ad1 (commit)
via d27a4435bd8c0f0971d51ddf454422fc77d48271 (commit)
via 489edf84c9a9c2122cef1b4e678154521525b54a (commit)
from 59048b0f1aa77313573a1004cd3a9f02692a7521 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 49e2ae65e892f93be7f87cfaae3392b50a99e4b1
Author: Justus Winter <justus at g10code.com>
Date: Mon Jan 30 15:51:19 2017 +0100
gpgscm: Use a compact vector representation.
* tests/gpgscm/scheme-private.h (struct cell): Add a compact vector
representation.
* tests/gpgscm/scheme.c (vector_length): Use new representation.
(vector_size): New macro.
(get_vector_object): Use the new representation.
(fill_vector): Likewise.
(vector_elem): Likewise.
(set_vector_elem): Likewise.
(mark): Likewise.
(gc): Likewise. Be careful not to confuse immediate values for type
flags.
(finalize_cell): Vectors now require finalization.
--
Previously, vectors were represented using consecutive cons cells,
wasting one word per cell for the type information. Fix that by using
a flat array.
Previously, a vector of size N required 1 + (n + 1) / 2 cells. Now it
uses 1 + (n - 1 + 2) / 3 cells.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/tests/gpgscm/scheme-private.h b/tests/gpgscm/scheme-private.h
index aba2319..ad8f571 100644
--- a/tests/gpgscm/scheme-private.h
+++ b/tests/gpgscm/scheme-private.h
@@ -56,6 +56,10 @@ struct cell {
struct cell *_cdr;
} _cons;
struct {
+ size_t _length;
+ pointer _elements[0];
+ } _vector;
+ struct {
char *_data;
const foreign_object_vtable *_vtable;
} _foreign_object;
diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index 32d8032..86df851 100644
--- a/tests/gpgscm/scheme.c
+++ b/tests/gpgscm/scheme.c
@@ -226,7 +226,11 @@ INTERFACE INLINE int is_string(pointer p) { return (type(p)==T_STRING); }
INTERFACE static int is_list(scheme *sc, pointer p);
INTERFACE INLINE int is_vector(pointer p) { return (type(p)==T_VECTOR); }
-#define vector_length(v) ivalue_unchecked(v)
+/* Given a vector, return it's length. */
+#define vector_length(v) (v)->_object._vector._length
+/* Given a vector length, compute the amount of cells required to
+ * represent it. */
+#define vector_size(len) (1 + ((len) - 1 + 2) / 3)
INTERFACE static void fill_vector(pointer vec, pointer obj);
INTERFACE static pointer vector_elem(pointer vec, int ielem);
INTERFACE static pointer set_vector_elem(pointer vec, int ielem, pointer a);
@@ -1035,12 +1039,11 @@ static pointer get_cell(scheme *sc, pointer a, pointer b)
static pointer get_vector_object(scheme *sc, int len, pointer init)
{
- pointer cells = get_consecutive_cells(sc,len/2+len%2+1);
+ pointer cells = get_consecutive_cells(sc, vector_size(len));
if(sc->no_memory) { return sc->sink; }
/* Record it as a vector so that gc understands it. */
- typeflag(cells) = (T_VECTOR | T_ATOM);
+ typeflag(cells) = (T_VECTOR | T_ATOM | T_FINALIZE);
vector_length(cells) = len;
- set_num_integer(cells);
fill_vector(cells,init);
if (gc_enabled (sc))
push_recent_alloc(sc, cells, sc->NIL);
@@ -1340,32 +1343,24 @@ INTERFACE static pointer mk_vector(scheme *sc, int len)
{ return get_vector_object(sc,len,sc->NIL); }
INTERFACE static void fill_vector(pointer vec, pointer obj) {
- int i;
- int n = vector_length(vec) / 2 + vector_length(vec) % 2;
- for(i=0; i < n; i++) {
- typeflag(vec+1+i) = T_PAIR;
- setimmutable(vec+1+i);
- car(vec+1+i)=obj;
- cdr(vec+1+i)=obj;
+ size_t i;
+ assert (is_vector (vec));
+ for(i = 0; i < vector_length(vec); i++) {
+ vec->_object._vector._elements[i] = set_immediate(obj);
}
}
INTERFACE static pointer vector_elem(pointer vec, int ielem) {
- int n=ielem/2;
- if(ielem%2==0) {
- return car(vec+1+n);
- } else {
- return cdr(vec+1+n);
- }
+ assert (is_vector (vec));
+ assert (ielem < vector_length(vec));
+ return clr_immediate(vec->_object._vector._elements[ielem]);
}
INTERFACE static pointer set_vector_elem(pointer vec, int ielem, pointer a) {
- int n=ielem/2;
- if(ielem%2==0) {
- return car(vec+1+n)=a;
- } else {
- return cdr(vec+1+n)=a;
- }
+ assert (is_vector (vec));
+ assert (ielem < vector_length(vec));
+ vec->_object._vector._elements[ielem] = set_immediate(a);
+ return a;
}
/* get new symbol */
@@ -1563,10 +1558,8 @@ static void mark(pointer a) {
E2: setmark(p);
if(is_vector(p)) {
int i;
- int n = vector_length(p) / 2 + vector_length(p) % 2;
- for(i=0; i < n; i++) {
- /* Vector cells will be treated like ordinary cells */
- mark(p+1+i);
+ for (i = 0; i < vector_length(p); i++) {
+ mark(clr_immediate(p->_object._vector._elements[i]));
}
}
#if SHOW_ERROR_LINE
@@ -1672,6 +1665,8 @@ static void gc(scheme *sc, pointer a, pointer b) {
for (i = sc->last_cell_seg; i >= 0; i--) {
p = sc->cell_seg[i] + CELL_SEGSIZE;
while (--p >= sc->cell_seg[i]) {
+ if (typeflag(p) & IMMEDIATE_TAG)
+ continue;
if (is_mark(p)) {
clrmark(p);
} else {
@@ -1708,6 +1703,16 @@ static void finalize_cell(scheme *sc, pointer a) {
sc->free(a->_object._port);
} else if(is_foreign_object(a)) {
a->_object._foreign_object._vtable->finalize(sc, a->_object._foreign_object._data);
+ } else if (is_vector(a)) {
+ int i;
+ for (i = vector_size(vector_length(a)) - 1; i > 0; i--) {
+ pointer p = a + i;
+ typeflag(p) = 0;
+ car(p) = sc->NIL;
+ cdr(p) = sc->free_cell;
+ sc->free_cell = p;
+ sc->fcells += 1;
+ }
}
}
commit e343984fc50e87830905614dc87f83f810551ad1
Author: Justus Winter <justus at g10code.com>
Date: Mon Jan 30 15:45:13 2017 +0100
gpgscm: Provide framework for immediate values.
* tests/gpgscm/scheme.c (IMMEDIATE_TAG): New macro.
({is,set,clr}_immediate): Likewise.
(enum scheme_types): Make type tags disjoint from immediate values.
(TYPE_BITS): We need one more bit now.
(ADJ,T_MASKTYPE): Compute values.
--
Immediate values are disjoint from all type tags and pointers,
allowing us to store immediate values in all memory locations.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index 311f606..32d8032 100644
--- a/tests/gpgscm/scheme.c
+++ b/tests/gpgscm/scheme.c
@@ -111,27 +111,43 @@ static const char *strlwr(char *s) {
# define FIRST_CELLSEGS 3
#endif
+
+
+/* Support for immediate values.
+ *
+ * Immediate values are tagged with IMMEDIATE_TAG, which is neither
+ * used in types, nor in pointer values.
+ *
+ * XXX: Currently, we only use this to tag pointers in vectors. */
+#define IMMEDIATE_TAG 1
+#define is_immediate(p) ((pointer) ((uintptr_t) (p) & IMMEDIATE_TAG))
+#define set_immediate(p) ((pointer) ((uintptr_t) (p) | IMMEDIATE_TAG))
+#define clr_immediate(p) ((pointer) ((uintptr_t) (p) & ~IMMEDIATE_TAG))
+
+
+
enum scheme_types {
- T_STRING=1,
- T_NUMBER=2,
- T_SYMBOL=3,
- T_PROC=4,
- T_PAIR=5,
- T_CLOSURE=6,
- T_CONTINUATION=7,
- T_FOREIGN=8,
- T_CHARACTER=9,
- T_PORT=10,
- T_VECTOR=11,
- T_MACRO=12,
- T_PROMISE=13,
- T_ENVIRONMENT=14,
- T_FOREIGN_OBJECT=15,
- T_BOOLEAN=16,
- T_NIL=17,
- T_EOF_OBJ=18,
- T_SINK=19,
- T_LAST_SYSTEM_TYPE=19
+ T_STRING=1 << 1, /* Do not use the lsb, it is used for
+ * immediate values. */
+ T_NUMBER=2 << 1,
+ T_SYMBOL=3 << 1,
+ T_PROC=4 << 1,
+ T_PAIR=5 << 1,
+ T_CLOSURE=6 << 1,
+ T_CONTINUATION=7 << 1,
+ T_FOREIGN=8 << 1,
+ T_CHARACTER=9 << 1,
+ T_PORT=10 << 1,
+ T_VECTOR=11 << 1,
+ T_MACRO=12 << 1,
+ T_PROMISE=13 << 1,
+ T_ENVIRONMENT=14 << 1,
+ T_FOREIGN_OBJECT=15 << 1,
+ T_BOOLEAN=16 << 1,
+ T_NIL=17 << 1,
+ T_EOF_OBJ=18 << 1,
+ T_SINK=19 << 1,
+ T_LAST_SYSTEM_TYPE=19 << 1
};
static const char *
@@ -163,9 +179,9 @@ type_to_string (enum scheme_types typ)
}
/* ADJ is enough slack to align cells in a TYPE_BITS-bit boundary */
-#define ADJ 32
-#define TYPE_BITS 5
-#define T_MASKTYPE 31 /* 0000000000011111 */
+#define TYPE_BITS 6
+#define ADJ (1 << TYPE_BITS)
+#define T_MASKTYPE (ADJ - 1)
#define T_TAGGED 1024 /* 0000010000000000 */
#define T_FINALIZE 2048 /* 0000100000000000 */
#define T_SYNTAX 4096 /* 0001000000000000 */
commit d27a4435bd8c0f0971d51ddf454422fc77d48271
Author: Justus Winter <justus at g10code.com>
Date: Mon Jan 30 17:08:27 2017 +0100
gpgscm: Fix setting the line of the first gc reservation.
* tests/gpgscm/scheme.c (_gc_disable): Negate guard.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index 7bb03e8..311f606 100644
--- a/tests/gpgscm/scheme.c
+++ b/tests/gpgscm/scheme.c
@@ -794,7 +794,7 @@ _gc_disable(struct scheme *sc, size_t reserve, int lineno)
if (sc->inhibit_gc == 0) {
reserve_cells(sc, (reserve));
sc->reserved_cells = (reserve);
-#ifndef NDEBUG
+#ifdef NDEBUG
(void) lineno;
#else
sc->reserved_lineno = lineno;
commit 489edf84c9a9c2122cef1b4e678154521525b54a
Author: Justus Winter <justus at g10code.com>
Date: Mon Jan 30 15:39:57 2017 +0100
gpgscm: Introduce macro for the vector length.
* tests/gpgscm/scheme.c (vector_length): New macro.
(get_vector_object): Use the new macro.
(oblist_add_by_name): Likewise.
(oblist_find_by_name): Likewise.
(oblist_all_symbols): Likewise.
(mk_vector): Likewise.
(mark): Likewise.
(new_slot_spec_in_env): Likewise.
(find_slot_spec_in_env): Likewise.
(opexe_2): Likewise.
(opexe_5): Likewise.
--
Introducing an abstraction reduces the coupling between code using
vectors and the implementation of vectors.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index c4725db..7bb03e8 100644
--- a/tests/gpgscm/scheme.c
+++ b/tests/gpgscm/scheme.c
@@ -210,6 +210,7 @@ INTERFACE INLINE int is_string(pointer p) { return (type(p)==T_STRING); }
INTERFACE static int is_list(scheme *sc, pointer p);
INTERFACE INLINE int is_vector(pointer p) { return (type(p)==T_VECTOR); }
+#define vector_length(v) ivalue_unchecked(v)
INTERFACE static void fill_vector(pointer vec, pointer obj);
INTERFACE static pointer vector_elem(pointer vec, int ielem);
INTERFACE static pointer set_vector_elem(pointer vec, int ielem, pointer a);
@@ -1022,7 +1023,7 @@ static pointer get_vector_object(scheme *sc, int len, pointer init)
if(sc->no_memory) { return sc->sink; }
/* Record it as a vector so that gc understands it. */
typeflag(cells) = (T_VECTOR | T_ATOM);
- ivalue_unchecked(cells)=len;
+ vector_length(cells) = len;
set_num_integer(cells);
fill_vector(cells,init);
if (gc_enabled (sc))
@@ -1092,7 +1093,7 @@ static pointer oblist_add_by_name(scheme *sc, const char *name)
typeflag(x) = T_SYMBOL;
setimmutable(car(x));
- location = hash_fn(name, ivalue_unchecked(sc->oblist));
+ location = hash_fn(name, vector_length(sc->oblist));
set_vector_elem(sc->oblist, location,
immutable_cons(sc, x, vector_elem(sc->oblist, location)));
gc_enable(sc);
@@ -1105,7 +1106,7 @@ static INLINE pointer oblist_find_by_name(scheme *sc, const char *name)
pointer x;
char *s;
- location = hash_fn(name, ivalue_unchecked(sc->oblist));
+ location = hash_fn(name, vector_length(sc->oblist));
for (x = vector_elem(sc->oblist, location); x != sc->NIL; x = cdr(x)) {
s = symname(car(x));
/* case-insensitive, per R5RS section 2. */
@@ -1122,7 +1123,7 @@ static pointer oblist_all_symbols(scheme *sc)
pointer x;
pointer ob_list = sc->NIL;
- for (i = 0; i < ivalue_unchecked(sc->oblist); i++) {
+ for (i = 0; i < vector_length(sc->oblist); i++) {
for (x = vector_elem(sc->oblist, i); x != sc->NIL; x = cdr(x)) {
ob_list = cons(sc, x, ob_list);
}
@@ -1324,7 +1325,7 @@ INTERFACE static pointer mk_vector(scheme *sc, int len)
INTERFACE static void fill_vector(pointer vec, pointer obj) {
int i;
- int n = ivalue(vec)/2+ivalue(vec)%2;
+ int n = vector_length(vec) / 2 + vector_length(vec) % 2;
for(i=0; i < n; i++) {
typeflag(vec+1+i) = T_PAIR;
setimmutable(vec+1+i);
@@ -1546,7 +1547,7 @@ static void mark(pointer a) {
E2: setmark(p);
if(is_vector(p)) {
int i;
- int n = ivalue_unchecked(p)/2+ivalue_unchecked(p)%2;
+ int n = vector_length(p) / 2 + vector_length(p) % 2;
for(i=0; i < n; i++) {
/* Vector cells will be treated like ordinary cells */
mark(p+1+i);
@@ -2615,7 +2616,7 @@ static INLINE void new_slot_spec_in_env(scheme *sc, pointer env,
slot = immutable_cons(sc, variable, value);
if (is_vector(car(env))) {
- int location = hash_fn(symname(variable), ivalue_unchecked(car(env)));
+ int location = hash_fn(symname(variable), vector_length(car(env)));
set_vector_elem(car(env), location,
immutable_cons(sc, slot, vector_elem(car(env), location)));
@@ -2632,7 +2633,7 @@ static pointer find_slot_in_env(scheme *sc, pointer env, pointer hdl, int all)
for (x = env; x != sc->NIL; x = cdr(x)) {
if (is_vector(car(x))) {
- location = hash_fn(symname(hdl), ivalue_unchecked(car(x)));
+ location = hash_fn(symname(hdl), vector_length(car(x)));
y = vector_elem(car(x), location);
} else {
y = car(x);
@@ -4366,14 +4367,14 @@ static pointer opexe_2(scheme *sc, enum scheme_opcodes op) {
CASE(OP_VECLEN): /* vector-length */
gc_disable(sc, 1);
- s_return_enable_gc(sc, mk_integer(sc, ivalue(car(sc->args))));
+ s_return_enable_gc(sc, mk_integer(sc, vector_length(car(sc->args))));
CASE(OP_VECREF): { /* vector-ref */
int index;
index=ivalue(cadr(sc->args));
- if(index>=ivalue(car(sc->args))) {
+ if(index >= vector_length(car(sc->args))) {
Error_1(sc,"vector-ref: out of bounds:",cadr(sc->args));
}
@@ -4388,7 +4389,7 @@ static pointer opexe_2(scheme *sc, enum scheme_opcodes op) {
}
index=ivalue(cadr(sc->args));
- if(index>=ivalue(car(sc->args))) {
+ if(index >= vector_length(car(sc->args))) {
Error_1(sc,"vector-set!: out of bounds:",cadr(sc->args));
}
@@ -5082,7 +5083,7 @@ static pointer opexe_5(scheme *sc, enum scheme_opcodes op) {
CASE(OP_PVECFROM): {
int i=ivalue_unchecked(cdr(sc->args));
pointer vec=car(sc->args);
- int len=ivalue_unchecked(vec);
+ int len = vector_length(vec);
if(i==len) {
putstr(sc,")");
s_return(sc,sc->T);
-----------------------------------------------------------------------
Summary of changes:
tests/gpgscm/scheme-private.h | 4 ++
tests/gpgscm/scheme.c | 142 ++++++++++++++++++++++++------------------
2 files changed, 86 insertions(+), 60 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list