From 7a18bb95425b6840f3f52d60b63cb5ff51a255de Mon Sep 17 00:00:00 2001 From: leo Date: Fri, 12 Apr 1996 08:46:44 +0000 Subject: [PATCH] Just give them more descriptive names. --- sys/arch/atari/atari/misc.c | 222 --------------------------------- sys/arch/atari/atari/misc.h | 55 -------- sys/arch/atari/atari/stalloc.c | 2 +- sys/arch/atari/atari/stalloc.h | 2 +- 4 files changed, 2 insertions(+), 279 deletions(-) delete mode 100644 sys/arch/atari/atari/misc.c delete mode 100644 sys/arch/atari/atari/misc.h diff --git a/sys/arch/atari/atari/misc.c b/sys/arch/atari/atari/misc.c deleted file mode 100644 index 51f046bd9d39..000000000000 --- a/sys/arch/atari/atari/misc.c +++ /dev/null @@ -1,222 +0,0 @@ -/* $NetBSD: misc.c,v 1.4 1996/02/22 10:10:54 leo Exp $ */ - -/* - * Copyright (c) 1995 Leo Weppelman (Atari modifications) - * Copyright (c) 1994 Christian E. Hopps (allocator stuff) - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include - -#include - -/* - * St-mem allocator. - */ -/* - * From atari_init.c - */ -extern u_long st_pool_size, st_pool_virt, st_pool_phys; - -#define PHYS_ADDR(virt) ((u_long)(virt) - st_pool_virt + st_pool_phys) - -static CIRCLEQ_HEAD(stlist, mem_node) st_list; -static CIRCLEQ_HEAD(freelist, mem_node) free_list; -u_long stmem_total; /* total free. */ - -void -init_stmem() -{ - int s = splhigh (); - struct mem_node *mem; - - stmem_total = st_pool_size - sizeof(*mem); - - mem = (struct mem_node *)st_pool_virt; - mem->size = st_pool_size - sizeof(*mem); - - CIRCLEQ_INIT(&st_list); - CIRCLEQ_INIT(&free_list); - - CIRCLEQ_INSERT_HEAD(&st_list, mem, link); - CIRCLEQ_INSERT_HEAD(&free_list, mem, free_link); - splx(s); -} - -void * -alloc_stmem(size, phys_addr) -u_long size; -void **phys_addr; -{ - struct mem_node *mn, *new, *bfit; - int s; - - if (size == 0) - return NULL; - - s = splhigh(); - - if (size & ~(ST_BLOCKMASK)) - size = (size & ST_BLOCKMASK) + ST_BLOCKSIZE; - - /* - * walk list of available nodes, finding the best-fit. - */ - bfit = NULL; - mn = free_list.cqh_first; - for(; mn != (void *)&free_list; mn = mn->free_link.cqe_next) { - if(size <= mn->size) { - if((bfit != NULL) && (bfit->size < mn->size)) - continue; - bfit = mn; - } - } - if(bfit != NULL) - mn = bfit; - if (mn == (void *)&free_list) { - printf("St-mem pool exhausted, binpatch 'st_pool_size'" - "to get more\n"); - splx(s); - return(NULL); - } - - if ((mn->size - size) <= sizeof (*mn)) { - /* - * our allocation would not leave room - * for a new node in between. - */ - CIRCLEQ_REMOVE(&free_list, mn, free_link); - mn->free_link.cqe_next = NULL; - size = mn->size; /* increase size. (or same) */ - stmem_total -= mn->size; - splx(s); - *phys_addr = (void*)PHYS_ADDR(&mn[1]); - return ((void *)&mn[1]); - } - - /* - * split the node's memory. - */ - new = mn; - new->size -= size + sizeof(struct mem_node); - mn = (struct mem_node *)(MNODES_MEM(new) + new->size); - mn->size = size; - - /* - * add split node to node list - * and mark as not on free list - */ - CIRCLEQ_INSERT_AFTER(&st_list, new, mn, link); - mn->free_link.cqe_next = NULL; - - stmem_total -= size + sizeof(struct mem_node); - splx(s); - *phys_addr = (void*)PHYS_ADDR(&mn[1]); - return ((void *)&mn[1]); -} - -void -free_stmem(mem) -void *mem; -{ - struct mem_node *mn, *next, *prev; - int s; - - if (mem == NULL) - return; - - s = splhigh(); - mn = (struct mem_node *)mem - 1; - next = mn->link.cqe_next; - prev = mn->link.cqe_prev; - - /* - * check ahead of us. - */ - if (next != (void *)&st_list && next->free_link.cqe_next) { - /* - * if next is: a valid node and a free node. ==> merge - */ - CIRCLEQ_INSERT_BEFORE(&free_list, next, mn, free_link); - CIRCLEQ_REMOVE(&st_list, next, link); - CIRCLEQ_REMOVE(&st_list, next, free_link); - stmem_total += mn->size + sizeof(struct mem_node); - mn->size += next->size + sizeof(struct mem_node); - } - if (prev != (void *)&st_list && prev->free_link.cqe_prev) { - /* - * if prev is: a valid node and a free node. ==> merge - */ - if (mn->free_link.cqe_next == NULL) - stmem_total += mn->size + sizeof(struct mem_node); - else { - /* already on free list */ - CIRCLEQ_REMOVE(&free_list, mn, free_link); - stmem_total += sizeof(struct mem_node); - } - CIRCLEQ_REMOVE(&st_list, mn, link); - prev->size += mn->size + sizeof(struct mem_node); - } else if (mn->free_link.cqe_next == NULL) { - /* - * we still are not on free list and we need to be. - * <-- | --> - */ - while (next != (void *)&st_list && prev != (void *)&st_list) { - if (next->free_link.cqe_next) { - CIRCLEQ_INSERT_BEFORE(&free_list, next, mn, - free_link); - break; - } - if (prev->free_link.cqe_next) { - CIRCLEQ_INSERT_AFTER(&free_list, prev, mn, - free_link); - break; - } - prev = prev->link.cqe_prev; - next = next->link.cqe_next; - } - if (mn->free_link.cqe_next == NULL) { - if (next == (void *)&st_list) { - /* - * we are not on list so we can add - * ourselves to the tail. (we walked to it.) - */ - CIRCLEQ_INSERT_TAIL(&free_list,mn,free_link); - } else { - CIRCLEQ_INSERT_HEAD(&free_list,mn,free_link); - } - } - stmem_total += mn->size;/* add our helpings to the pool. */ - } - splx(s); -} diff --git a/sys/arch/atari/atari/misc.h b/sys/arch/atari/atari/misc.h deleted file mode 100644 index 477f4535e479..000000000000 --- a/sys/arch/atari/atari/misc.h +++ /dev/null @@ -1,55 +0,0 @@ -/* $NetBSD: misc.h,v 1.1.1.1 1995/03/26 07:12:21 leo Exp $ */ - -/* - * Copyright (c) 1994 Christian E. Hopps (allocator stuff) - * Copyright (c) 1995 Leo Weppelman (Atari modifications) - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _ATARI_MISC_H -#define _ATARI_MISC_H -/* - * St-mem allocator stuff. - */ -struct mem_node { - CIRCLEQ_ENTRY(mem_node) link; - CIRCLEQ_ENTRY(mem_node) free_link; - u_long size; /* size of memory following node. */ -}; - -#define ST_BLOCKSIZE (sizeof(long)) -#define ST_BLOCKMASK (~(ST_BLOCKSIZE - 1)) -#define MNODES_MEM(mn) ((u_char *)(&mn[1])) - -void init_stmem __P((void)); -void *alloc_stmem __P((u_long, void **)); -void free_stmem __P((void *)); - -#endif /* _ATARI_MISC_H */ diff --git a/sys/arch/atari/atari/stalloc.c b/sys/arch/atari/atari/stalloc.c index 48b06560623f..6d446f975ba2 100644 --- a/sys/arch/atari/atari/stalloc.c +++ b/sys/arch/atari/atari/stalloc.c @@ -1,4 +1,4 @@ -/* $NetBSD: stalloc.c,v 1.4 1996/02/22 10:10:54 leo Exp $ */ +/* $NetBSD: stalloc.c,v 1.5 1996/04/12 08:46:44 leo Exp $ */ /* * Copyright (c) 1995 Leo Weppelman (Atari modifications) diff --git a/sys/arch/atari/atari/stalloc.h b/sys/arch/atari/atari/stalloc.h index 9257d00c99d3..ee8ce8bd4152 100644 --- a/sys/arch/atari/atari/stalloc.h +++ b/sys/arch/atari/atari/stalloc.h @@ -1,4 +1,4 @@ -/* $NetBSD: stalloc.h,v 1.1.1.1 1995/03/26 07:12:21 leo Exp $ */ +/* $NetBSD: stalloc.h,v 1.2 1996/04/12 08:46:45 leo Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps (allocator stuff)