From 373501e7698edb87caaa1fd8a3d346c402e6a263 Mon Sep 17 00:00:00 2001 From: marcel Date: Mon, 24 Feb 2003 08:07:05 +0000 Subject: Third attempt at removing machdep.h and using ALIGN from . The initial stack_block is staticly allocated and will be aligned according to the alignment requirements of pointers, which does not necessarily match the alignment enforced by ALIGN. To solve this a more involved change is required: remove the static initial stack and deal with an initial condition of not having a stack at all. This change is therefore more risky than the previous ones, but unavoidable (other than not using the platform default alignment). Discussed with: tjr Approved and reviewed by: tjr Tested on: alpha, i386, ia64 and sparc64 --- bin/sh/machdep.h | 52 --------------------------- bin/sh/memalloc.c | 101 ++++++++++++++++++++++++++++------------------------- bin/sh/nodes.c.pat | 2 +- 3 files changed, 54 insertions(+), 101 deletions(-) delete mode 100644 bin/sh/machdep.h (limited to 'bin/sh') diff --git a/bin/sh/machdep.h b/bin/sh/machdep.h deleted file mode 100644 index 20aadd0..0000000 --- a/bin/sh/machdep.h +++ /dev/null @@ -1,52 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Kenneth Almquist. - * - * 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. - * - * @(#)machdep.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ - */ - -/* - * Most machines require the value returned from malloc to be aligned - * in some way. The following macro will get this right on many machines. - */ - -#ifndef ALIGN -union align { - int i; - char *cp; -}; - -#define ALIGN(nbytes) (((nbytes) + sizeof(union align) - 1) & ~(sizeof(union align) - 1)) -#endif diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c index a50d661..cfe087e 100644 --- a/bin/sh/memalloc.c +++ b/bin/sh/memalloc.c @@ -42,11 +42,11 @@ static char sccsid[] = "@(#)memalloc.c 8.3 (Berkeley) 5/4/95"; #include __FBSDID("$FreeBSD$"); +#include #include "shell.h" #include "output.h" #include "memalloc.h" #include "error.h" -#include "machdep.h" #include "mystring.h" #include "expand.h" #include @@ -100,27 +100,47 @@ savestr(char *s) * to make this more efficient, and also to avoid all sorts of exception * handling code to handle interrupts in the middle of a parse. * - * The size 504 was chosen because the Ultrix malloc handles that size - * well. + * The size 496 was chosen because with 16-byte alignment the total size + * for the allocated block is 512. */ -#define MINSIZE 504 /* minimum size of a block */ +#define MINSIZE 496 /* minimum size of a block. */ struct stack_block { struct stack_block *prev; - char space[MINSIZE]; + /* Data follows */ }; +#define SPACE(sp) ((char*)(sp) + ALIGN(sizeof(struct stack_block))) -struct stack_block stackbase; -struct stack_block *stackp = &stackbase; +struct stack_block *stackp; struct stackmark *markp; -char *stacknxt = stackbase.space; -int stacknleft = MINSIZE; +char *stacknxt; +int stacknleft; int sstrnleft; int herefd = -1; +static void +stnewblock(int nbytes) +{ + struct stack_block *sp; + int allocsize; + + if (nbytes < MINSIZE) + nbytes = MINSIZE; + + allocsize = ALIGN(sizeof(struct stack_block)) + ALIGN(nbytes); + + INTOFF; + sp = ckmalloc(allocsize); + sp->prev = stackp; + stacknxt = SPACE(sp); + stacknleft = allocsize - (stacknxt - (char*)sp); + stackp = sp; + INTON; +} + pointer stalloc(int nbytes) @@ -128,22 +148,8 @@ stalloc(int nbytes) char *p; nbytes = ALIGN(nbytes); - if (nbytes > stacknleft) { - int blocksize; - struct stack_block *sp; - - blocksize = nbytes; - if (blocksize < MINSIZE) - blocksize = MINSIZE; - INTOFF; - sp = ckmalloc(sizeof(struct stack_block) - MINSIZE + - blocksize); - sp->prev = stackp; - stacknxt = sp->space; - stacknleft = blocksize; - stackp = sp; - INTON; - } + if (nbytes > stacknleft) + stnewblock(nbytes); p = stacknxt; stacknxt += nbytes; stacknleft -= nbytes; @@ -212,41 +218,40 @@ growstackblock(void) int oldlen; struct stack_block *sp; struct stack_block *oldstackp; + struct stackmark *xmark; - newlen = ALIGN(stacknleft * 2 + 100); + newlen = (stacknleft == 0) ? MINSIZE : stacknleft * 2 + 100; + newlen = ALIGN(newlen); oldspace = stacknxt; oldlen = stacknleft; - if (stacknxt == stackp->space && stackp != &stackbase) { + if (stackp != NULL && stacknxt == SPACE(stackp)) { INTOFF; oldstackp = stackp; - sp = stackp; - stackp = sp->prev; - sp = ckrealloc((pointer)sp, sizeof(struct stack_block) - - MINSIZE + newlen); + stackp = oldstackp->prev; + sp = ckrealloc((pointer)oldstackp, newlen); sp->prev = stackp; stackp = sp; - stacknxt = sp->space; - stacknleft = newlen; - { - /* Stack marks pointing to the start of the old block - * must be relocated to point to the new block - */ - struct stackmark *xmark; - xmark = markp; - while (xmark != NULL && xmark->stackp == oldstackp) { - xmark->stackp = stackp; - xmark->stacknxt = stacknxt; - xmark->stacknleft = stacknleft; - xmark = xmark->marknext; - } + stacknxt = SPACE(sp); + stacknleft = newlen - (stacknxt - (char*)sp); + + /* + * Stack marks pointing to the start of the old block + * must be relocated to point to the new block + */ + xmark = markp; + while (xmark != NULL && xmark->stackp == oldstackp) { + xmark->stackp = stackp; + xmark->stacknxt = stacknxt; + xmark->stacknleft = stacknleft; + xmark = xmark->marknext; } INTON; } else { p = stalloc(newlen); - memcpy(p, oldspace, oldlen); - stacknxt = p; /* free the space */ - stacknleft += newlen; /* we just allocated */ + if (oldlen != 0) + memcpy(p, oldspace, oldlen); + stunalloc(p); } } diff --git a/bin/sh/nodes.c.pat b/bin/sh/nodes.c.pat index 2fc79f0..80541b0 100644 --- a/bin/sh/nodes.c.pat +++ b/bin/sh/nodes.c.pat @@ -37,6 +37,7 @@ * $FreeBSD$ */ +#include #include /* * Routine for dealing with parsed shell commands. @@ -45,7 +46,6 @@ #include "shell.h" #include "nodes.h" #include "memalloc.h" -#include "machdep.h" #include "mystring.h" -- cgit v1.1