diff options
author | tjr <tjr@FreeBSD.org> | 2003-02-17 03:51:44 +0000 |
---|---|---|
committer | tjr <tjr@FreeBSD.org> | 2003-02-17 03:51:44 +0000 |
commit | eadbecd88b3b77b4c6e00192f699b8048748ae57 (patch) | |
tree | c43283d90f3a5562b9783023cb26bec033acad15 /bin/sh | |
parent | aa384c931fc62f42246713400c2b6e5b5d446165 (diff) | |
download | FreeBSD-src-eadbecd88b3b77b4c6e00192f699b8048748ae57.zip FreeBSD-src-eadbecd88b3b77b4c6e00192f699b8048748ae57.tar.gz |
Second attempt at removing machdep.h and using ALIGN from <sys/param.h>.
The problem with the previous attempt, as noticed by Marcel, was that
stacknxt was being aligned to a pointer boundary instead of an
ALIGNBYTES + 1 boundary, which broke sparc64.
Diffstat (limited to 'bin/sh')
-rw-r--r-- | bin/sh/machdep.h | 52 | ||||
-rw-r--r-- | bin/sh/memalloc.c | 7 | ||||
-rw-r--r-- | bin/sh/nodes.c.pat | 3 |
3 files changed, 6 insertions, 56 deletions
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..c3e5fca 100644 --- a/bin/sh/memalloc.c +++ b/bin/sh/memalloc.c @@ -42,11 +42,12 @@ static char sccsid[] = "@(#)memalloc.c 8.3 (Berkeley) 5/4/95"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/param.h> + #include "shell.h" #include "output.h" #include "memalloc.h" #include "error.h" -#include "machdep.h" #include "mystring.h" #include "expand.h" #include <stdlib.h> @@ -139,8 +140,8 @@ stalloc(int nbytes) sp = ckmalloc(sizeof(struct stack_block) - MINSIZE + blocksize); sp->prev = stackp; - stacknxt = sp->space; - stacknleft = blocksize; + stacknxt = (char *)ALIGN(sp->space); + stacknleft = blocksize - (stacknxt - sp->space); stackp = sp; INTON; } diff --git a/bin/sh/nodes.c.pat b/bin/sh/nodes.c.pat index 2fc79f0..e5a2287 100644 --- a/bin/sh/nodes.c.pat +++ b/bin/sh/nodes.c.pat @@ -37,6 +37,8 @@ * $FreeBSD$ */ +#include <sys/param.h> + #include <stdlib.h> /* * Routine for dealing with parsed shell commands. @@ -45,7 +47,6 @@ #include "shell.h" #include "nodes.h" #include "memalloc.h" -#include "machdep.h" #include "mystring.h" |