From 1a40bc70b9db813c64d9a8b1e96eaf924e523d03 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Mon, 7 Jan 2019 23:34:16 -0500 Subject: [PATCH] Revert "adds temporary gum_w hash slot to u3_noun" This reverts commit cd96ad658d3f15bab0dbc05a300bd76ac05f4198. --- include/noun/allocate.h | 7 ++----- noun/allocate.c | 3 --- noun/imprison.c | 3 --- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/include/noun/allocate.h b/include/noun/allocate.h index fbf5dca21..32a8e8d37 100644 --- a/include/noun/allocate.h +++ b/include/noun/allocate.h @@ -27,9 +27,9 @@ /* u3a_minimum: minimum number of words in a box. */ #ifdef U3_MEMORY_DEBUG -# define u3a_minimum 9 +# define u3a_minimum 8 #else -# define u3a_minimum 7 +# define u3a_minimum 6 #endif /* u3a_fbox_no: number of free lists per size. @@ -43,19 +43,16 @@ */ typedef struct { c3_w mug_w; - c3_w gum_w; } u3a_noun; typedef struct { c3_w mug_w; - c3_w gum_w; c3_w len_w; c3_w buf_w[0]; } u3a_atom; typedef struct { c3_w mug_w; - c3_w gum_w; u3_noun hed; u3_noun tel; } u3a_cell; diff --git a/noun/allocate.c b/noun/allocate.c index b2f6c5259..7f2272439 100644 --- a/noun/allocate.c +++ b/noun/allocate.c @@ -904,7 +904,6 @@ _me_wash_north(u3_noun dog) if ( dog_u->mug_w == 0 ) return; dog_u->mug_w = 0; // power wash - dog_u->gum_w = 0; // if ( dog_u->mug_w >> 31 ) { dog_u->mug_w = 0; } if ( _(u3a_is_pom(dog)) ) { @@ -938,7 +937,6 @@ _me_wash_south(u3_noun dog) if ( dog_u->mug_w == 0 ) return; dog_u->mug_w = 0; // power wash - dog_u->gum_w = 0; // if ( dog_u->mug_w >> 31 ) { dog_u->mug_w = 0; } if ( _(u3a_is_pom(dog)) ) { @@ -1830,7 +1828,6 @@ u3a_slab(c3_w len_w) u3a_atom* pug_u = (void *)nov_w; pug_u->mug_w = 0; - pug_u->gum_w = 0; pug_u->len_w = len_w; /* Clear teh slab. diff --git a/noun/imprison.c b/noun/imprison.c index 5c78a21af..13ba89cc5 100644 --- a/noun/imprison.c +++ b/noun/imprison.c @@ -33,7 +33,6 @@ u3i_words(c3_w a_w, u3a_atom* nov_u = (void*)nov_w; nov_u->mug_w = 0; - nov_u->gum_w = 0; nov_u->len_w = a_w; /* Fill the words. @@ -112,7 +111,6 @@ u3i_bytes(c3_w a_w, u3a_atom* nov_u = (void*)nov_w; nov_u->mug_w = 0; - nov_u->gum_w = 0; nov_u->len_w = len_w; /* Clear the words. @@ -214,7 +212,6 @@ u3i_cell(u3_noun a, u3_noun b) u3_noun pro; nov_u->mug_w = 0; - nov_u->gum_w = 0; nov_u->hed = a; nov_u->tel = b;