diff options
| author | marius <marius@FreeBSD.org> | 2010-03-21 13:18:08 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2010-03-21 13:18:08 +0000 |
| commit | 178b23b477e0ab53a43b363eb27dba7840845b67 (patch) | |
| tree | eb26467ed58669dfdad491cdbaeffd0956cd4dad /lib | |
| parent | 86c825f19119322dafe0fca5ac8e8dcd696a7cb7 (diff) | |
| download | FreeBSD-src-178b23b477e0ab53a43b363eb27dba7840845b67.zip FreeBSD-src-178b23b477e0ab53a43b363eb27dba7840845b67.tar.gz | |
Avoid aliasing which leads to incorrect results when compiling with the
default strict aliasing rules.
PR: 144900
Submitted by: Peter Jeremy
MFC after: 3 days
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/sparc64/fpu/fpu_explode.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/lib/libc/sparc64/fpu/fpu_explode.c b/lib/libc/sparc64/fpu/fpu_explode.c index 12c8802..474e0df 100644 --- a/lib/libc/sparc64/fpu/fpu_explode.c +++ b/lib/libc/sparc64/fpu/fpu_explode.c @@ -139,9 +139,9 @@ __fpu_xtof(fp, i) * a signed or unsigned entity. */ if (fp->fp_sign && (int64_t)i < 0) - *((int64_t*)fp->fp_mant) = -i; + *((int64_t *)fp->fp_mant) = -i; else - *((int64_t*)fp->fp_mant) = i; + *((int64_t *)fp->fp_mant) = i; fp->fp_mant[2] = 0; fp->fp_mant[3] = 0; __fpu_norm(fp); @@ -262,14 +262,12 @@ __fpu_explode(fe, fp, type, reg) struct fpn *fp; int type, reg; { - u_int32_t s, *sp; - u_int64_t l[2]; - void *vl = l; + u_int64_t l0, l1; + u_int32_t s; if (type == FTYPE_LNG || type == FTYPE_DBL || type == FTYPE_EXT) { - l[0] = __fpu_getreg64(reg & ~1); - sp = vl; - fp->fp_sign = sp[0] >> 31; + l0 = __fpu_getreg64(reg & ~1); + fp->fp_sign = l0 >> 63; } else { s = __fpu_getreg(reg); fp->fp_sign = s >> 31; @@ -277,7 +275,7 @@ __fpu_explode(fe, fp, type, reg) fp->fp_sticky = 0; switch (type) { case FTYPE_LNG: - s = __fpu_xtof(fp, l[0]); + s = __fpu_xtof(fp, l0); break; case FTYPE_INT: @@ -289,12 +287,13 @@ __fpu_explode(fe, fp, type, reg) break; case FTYPE_DBL: - s = __fpu_dtof(fp, sp[0], sp[1]); + s = __fpu_dtof(fp, l0 >> 32, l0 & 0xffffffff); break; case FTYPE_EXT: - l[1] = __fpu_getreg64((reg & ~1) + 2); - s = __fpu_qtof(fp, sp[0], sp[1], sp[2], sp[3]); + l1 = __fpu_getreg64((reg & ~1) + 2); + s = __fpu_qtof(fp, l0 >> 32, l0 & 0xffffffff, l1 >> 32, + l1 & 0xffffffff); break; default: |
