libretro/libretro-tyrquake
1
0
Fork 0
mirror of https://github.com/libretro/libretro-tyrquake.git synced 2024-11-23 16:10:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix strict aliasing issues in r_sky.c

Browse Source 
Should also eliminate the unaligned access issues.

Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
This commit is contained in:
Kevin Shanahan 2012-11-02 18:39:39 +10:30
parent b37ed7266d
commit 352565504c
1 changed files with 10 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
common/r_sky.c
View File

@ -112,29 +112,15 @@ R_MakeSky(void)
for (y = 0; y < SKYSIZE; y++) {
baseofs = ((y + yshift) & SKYMASK) * 131;
// FIXME: clean this up
#ifdef UNALIGNED_OK
for (x = 0; x < SKYSIZE; x += 4) {
unsigned bsky, bmask;
ofs = baseofs + ((x + xshift) & SKYMASK);
// PORT: unaligned dword access to bottommask and bottomsky
*pnewsky = (*(pnewsky + (128 / sizeof(unsigned))) &
*(unsigned *)&bottommask[ofs]) |
*(unsigned *)&bottomsky[ofs];
memcpy(&bsky, &bottomsky[ofs], sizeof(bsky));
memcpy(&bmask, &bottommask[ofs], sizeof(bmask));
*pnewsky = (pnewsky[128 / sizeof(unsigned)] & bmask) | bsky;
pnewsky++;
}
#else
for (x = 0; x < SKYSIZE; x++) {
ofs = baseofs + ((x + xshift) & SKYMASK);
*(byte *)pnewsky = (*((byte *)pnewsky + 128) &
*(byte *)&bottommask[ofs]) |
*(byte *)&bottomsky[ofs];
pnewsky = (unsigned *)((byte *)pnewsky + 1);
}
#endif
pnewsky += 128 / sizeof(unsigned);
}
@ -165,31 +151,16 @@ R_GenSkyTile(void *pdest)
for (y = 0; y < SKYSIZE; y++) {
baseofs = ((y + yshift) & SKYMASK) * 131;
// FIXME: clean this up
#ifdef UNALIGNED_OK
for (x = 0; x < SKYSIZE; x += 4) {
unsigned bsky, bmask;
ofs = baseofs + ((x + xshift) & SKYMASK);
// PORT: unaligned dword access to bottommask and bottomsky
*pd = (*(pnewsky + (128 / sizeof(unsigned))) &
*(unsigned *)&bottommask[ofs]) |
*(unsigned *)&bottomsky[ofs];
memcpy(&bsky, &bottomsky[ofs], sizeof(bsky));
memcpy(&bmask, &bottommask[ofs], sizeof(bmask));
*pd = (pnewsky[128 / sizeof(unsigned)] & bmask) | bsky;
pnewsky++;
pd++;
}
#else
for (x = 0; x < SKYSIZE; x++) {
ofs = baseofs + ((x + xshift) & SKYMASK);
*(byte *)pd = (*((byte *)pnewsky + 128) &
*(byte *)&bottommask[ofs]) |
*(byte *)&bottomsky[ofs];
pnewsky = (unsigned *)((byte *)pnewsky + 1);
pd = (unsigned *)((byte *)pd + 1);
}
#endif
pnewsky += 128 / sizeof(unsigned);
}
}