Move all the RAA code out of nasmlib

The RAA code doesn't have to be in nasmlib; it is only used by nasm
itself, and is better handled in a separate module.

1 files changed, 0 insertions, 93 deletions

diff --git a/nasmlib.c b/nasmlib.c
index cf19024e..4d78eef2 100644
--- a/nasmlib.c
+++ b/nasmlib.c
@@ -469,99 +469,6 @@ void standard_extension(char *inname, char *outname, char *extension,
         strcpy(p, extension);
 }
 
-#define LEAFSIZ (sizeof(RAA)-sizeof(RAA_UNION)+sizeof(RAA_LEAF))
-#define BRANCHSIZ (sizeof(RAA)-sizeof(RAA_UNION)+sizeof(RAA_BRANCH))
-
-#define LAYERSHIFT(r) ( (r)->layers==0 ? RAA_BLKSHIFT : RAA_LAYERSHIFT )
-
-static struct RAA *real_raa_init(int layers)
-{
-    struct RAA *r;
-    int i;
-
-    if (layers == 0) {
-        r = nasm_zalloc(LEAFSIZ);
-        r->shift = 0;
-    } else {
-        r = nasm_malloc(BRANCHSIZ);
-        r->layers = layers;
-        for (i = 0; i < RAA_LAYERSIZE; i++)
-            r->u.b.data[i] = NULL;
-        r->shift = (RAA_BLKSHIFT-RAA_LAYERSHIFT) + layers*RAA_LAYERSHIFT;
-    }
-    return r;
-}
-
-struct RAA *raa_init(void)
-{
-    return real_raa_init(0);
-}
-
-void raa_free(struct RAA *r)
-{
-    if (r->layers) {
-        struct RAA **p;
-        for (p = r->u.b.data; p - r->u.b.data < RAA_LAYERSIZE; p++)
-            if (*p)
-                raa_free(*p);
-    }
-    nasm_free(r);
-}
-
-int64_t raa_read(struct RAA *r, int32_t posn)
-{
-    if ((uint32_t)posn >= (UINT32_C(1) << (r->shift + LAYERSHIFT(r))))
-        return 0;               /* Return 0 for undefined entries */
-    while (r->layers > 0) {
-	int32_t l = posn >> r->shift;
-	posn &= (UINT32_C(1) << r->shift)-1;
-        r = r->u.b.data[l];
-        if (!r)
-            return 0;           /* Return 0 for undefined entries */
-    }
-    return r->u.l.data[posn];
-}
-
-struct RAA *raa_write(struct RAA *r, int32_t posn, int64_t value)
-{
-    struct RAA *result;
-
-    if (posn < 0)
-        nasm_malloc_error(ERR_PANIC, "negative position in raa_write");
-
-    while ((UINT32_C(1) << (r->shift+LAYERSHIFT(r))) <= (uint32_t)posn) {
-        /*
-         * Must add a layer.
-         */
-        struct RAA *s;
-        int i;
-
-        s = nasm_malloc(BRANCHSIZ);
-        for (i = 0; i < RAA_LAYERSIZE; i++)
-            s->u.b.data[i] = NULL;
-        s->layers = r->layers + 1;
-        s->shift = LAYERSHIFT(r) + r->shift;
-        s->u.b.data[0] = r;
-        r = s;
-    }
-
-    result = r;
-
-    while (r->layers > 0) {
-        struct RAA **s;
-	int32_t l = posn >> r->shift;
-	posn &= (UINT32_C(1) << r->shift)-1;
-        s = &r->u.b.data[l];
-        if (!*s)
-            *s = real_raa_init(r->layers - 1);
-        r = *s;
-    }
-
-    r->u.l.data[posn] = value;
-
-    return result;
-}
-
 /*
  * Common list of prefix names
  */