d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename the ALIGN macro to LINT_ALIGN so it does not clash with machine/param.h

Browse Source 
Bump the alignment to 16bytes because lint1 memory allocator is used for
objects that require 16bytes alignment on amd64 (ie. val_t). This makes
lint1 work when compiled with compiler(s) that use SSE for memcpy on amd64.
(e.g. clang).

Approved by:	ed (mentor)
This commit is contained in:
Roman Divacky 2010-04-09 15:21:11 +00:00
parent a3238bcf8f
commit 7f18fc27cd
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/xlint/lint1/decl.c
View File

@ -825,15 +825,15 @@ getbound(type_t *tp)
} else if (t == FUNC) {
/* compiler takes alignment of function */
error(14);
a = ALIGN(1) * CHAR_BIT;
a = LINT_ALIGN(1) * CHAR_BIT;
} else {
if ((a = size(t)) == 0) {
a = CHAR_BIT;
} else if (a > ALIGN(1) * CHAR_BIT) {
a = ALIGN(1) * CHAR_BIT;
} else if (a > LINT_ALIGN(1) * CHAR_BIT) {
a = LINT_ALIGN(1) * CHAR_BIT;
}
}
if (a < CHAR_BIT || a > ALIGN(1) * CHAR_BIT)
if (a < CHAR_BIT || a > LINT_ALIGN(1) * CHAR_BIT)
lerror("getbound() 1");
return (a);
}

4
usr.bin/xlint/lint1/lint1.h
View File

@ -38,8 +38,8 @@ __FBSDID("$FreeBSD$");
#include "op.h"
/* XXX - works for most systems, but the whole ALIGN thing needs to go away */
#ifndef ALIGN
#define ALIGN(x) (((x) + 7) & ~7)
#ifndef LINT_ALIGN
#define LINT_ALIGN(x) (((x) + 15) & ~15)
#endif
/*

2
usr.bin/xlint/lint1/mem1.c
View File

@ -203,7 +203,7 @@ xgetblk(mbl_t **mbp, size_t s)
void *p;
size_t t = 0;
s = ALIGN(s);
s = LINT_ALIGN(s);
if ((mb = *mbp) == NULL || mb->nfree < s) {
if ((mb = frmblks) == NULL) {
if (s > mblklen) {