devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

wolf3d: fix FM OPL alignment bug in a cleaner way

Browse source 
wl_def.h has a #pragma pack(1), which causes issues when we take the
address of an unaligned struct field. This fixes the issue by
disabling packing in fmopl_gpl.c.

Change-Id: I526880fa73226e8028855896f7efc3a66571b3ec
This commit is contained in:
Franklin Wei 2019-07-09 17:34:09 -04:00
parent b1f16371b0
commit 152e415b0d
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
apps/plugins/sdl/progs/wolf3d/fmopl_gpl.c
View file

@ -82,7 +82,9 @@ verify volume of the FM part on the Y8950
#include "fmopl.h" #include "fmopl.h"
// Don't pack structs in here. This causes dangerous things on ARM
// regarding alignment.
#pragma pack()
/* output final shift */ /* output final shift */
#if (OPL_SAMPLE_BITS==16) #if (OPL_SAMPLE_BITS==16)
@ -207,8 +209,6 @@ static FILE * cymfile = NULL;
#define OPL_TYPE_YM3812 (OPL_TYPE_WAVESEL) #define OPL_TYPE_YM3812 (OPL_TYPE_WAVESEL)
#define OPL_TYPE_Y8950 (OPL_TYPE_ADPCM|OPL_TYPE_KEYBOARD|OPL_TYPE_IO) #define OPL_TYPE_Y8950 (OPL_TYPE_ADPCM|OPL_TYPE_KEYBOARD|OPL_TYPE_IO)
struct OPL_SLOT struct OPL_SLOT
{ {
UINT32 ar; /* attack rate: AR<<2 */ UINT32 ar; /* attack rate: AR<<2 */
@ -267,10 +267,6 @@ typedef struct OPL_CH OPL_CH;
/* OPL state */ /* OPL state */
struct FM_OPL struct FM_OPL
{ {
// moved to beginning to fix alignment
signed int phase_modulation __attribute__((aligned)); /* phase modulation input (SLOT 2) */
signed int output[1] __attribute__((aligned));
/* FM channel slots */ /* FM channel slots */
OPL_CH P_CH[9]; /* OPL/OPL2 chips have 9 channels*/ OPL_CH P_CH[9]; /* OPL/OPL2 chips have 9 channels*/
@ -326,7 +322,6 @@ struct FM_OPL
void *IRQParam; /* IRQ parameter */ void *IRQParam; /* IRQ parameter */
OPL_UPDATEHANDLER UpdateHandler;/* stream update handler */ OPL_UPDATEHANDLER UpdateHandler;/* stream update handler */
void *UpdateParam; /* stream update parameter */ void *UpdateParam; /* stream update parameter */
UINT8 type; /* chip type */ UINT8 type; /* chip type */
UINT8 address; /* address register */ UINT8 address; /* address register */
UINT8 status; /* status flag */ UINT8 status; /* status flag */
@ -339,10 +334,13 @@ struct FM_OPL
double TimerBase; /* Timer base time (==sampling time)*/ double TimerBase; /* Timer base time (==sampling time)*/
device_t *device; device_t *device;
signed int phase_modulation; /* phase modulation input (SLOT 2) */
signed int output[1];
#if BUILD_Y8950 #if BUILD_Y8950
INT32 output_deltat[4]; /* for Y8950 DELTA-T, chip is mono, that 4 here is just for safety */ INT32 output_deltat[4]; /* for Y8950 DELTA-T, chip is mono, that 4 here is just for safety */
#endif #endif
} __attribute__((aligned)); };
typedef struct FM_OPL FM_OPL; typedef struct FM_OPL FM_OPL;

1
apps/plugins/sdl/progs/wolf3d/wl_def.h
View file

@ -22,6 +22,7 @@
# define O_BINARY 0 # define O_BINARY 0
#endif #endif
// needed by wolf, but is dangerous on ARM
#pragma pack(1) #pragma pack(1)
#if defined(_arch_dreamcast) #if defined(_arch_dreamcast)