diff options
| author | Eric Botcazou <ebotcazou@libertysurf.fr> | 2003-12-01 08:15:31 +0100 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2003-12-01 07:15:31 +0000 |
| commit | e82407b5bb381e6940f8d4f1a4c218146acc1524 (patch) | |
| tree | 43fd149070ddd68f998f0fbe7e3aa7ebea4728aa /gcc | |
| parent | a668c6adec09839b44d2ae6c1046a2e100e10936 (diff) | |
| download | gcc-e82407b5bb381e6940f8d4f1a4c218146acc1524.zip gcc-e82407b5bb381e6940f8d4f1a4c218146acc1524.tar.gz gcc-e82407b5bb381e6940f8d4f1a4c218146acc1524.tar.bz2 | |
re PR middle-end/7847 (pragma pack / attribute(packed): unaligned access to packed structure)
PR middle-end/7847
* expr.c (expand_expr) [normal_inner_ref]: When 'offset' is non-zero,
do not recheck that 'op0' is a MEM. Move comment. When testing for
unaligned objects, take also into account the alignment of 'op0' and
'mode1' if 'op0' is a MEM.
From-SVN: r74092
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/expr.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/unaligned-1.c | 49 |
4 files changed, 68 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 02f466d..d109ceb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2003-12-01 Eric Botcazou <ebotcazou@libertysurf.fr> + + PR middle-end/7847 + * expr.c (expand_expr) [normal_inner_ref]: When 'offset' is non-zero, + do not recheck that 'op0' is a MEM. Move comment. When testing for + unaligned objects, take also into account the alignment of 'op0' and + 'mode1' if 'op0' is a MEM. + 2003-12-01 Gabriel Dos Reis <gdr@integrable-solutions.net> * doc/c-tree.texi (Function Bodies): Update HANDLER documentation. @@ -7153,10 +7153,9 @@ expand_expr (tree exp, rtx target, enum machine_mode tmode, offset_rtx = convert_to_mode (ptr_mode, offset_rtx, 0); #endif - /* A constant address in OP0 can have VOIDmode, we must not try - to call force_reg for that case. Avoid that case. */ - if (GET_CODE (op0) == MEM - && GET_MODE (op0) == BLKmode + if (GET_MODE (op0) == BLKmode + /* A constant address in OP0 can have VOIDmode, we must + not try to call force_reg in that case. */ && GET_MODE (XEXP (op0, 0)) != VOIDmode && bitsize != 0 && (bitpos % bitsize) == 0 @@ -7213,7 +7212,10 @@ expand_expr (tree exp, rtx target, enum machine_mode tmode, fetch it as a bit field. */ || (mode1 != BLKmode && (((TYPE_ALIGN (TREE_TYPE (tem)) < GET_MODE_ALIGNMENT (mode) - || (bitpos % GET_MODE_ALIGNMENT (mode) != 0)) + || (bitpos % GET_MODE_ALIGNMENT (mode) != 0) + || (GET_CODE (op0) == MEM + && (MEM_ALIGN (op0) < GET_MODE_ALIGNMENT (mode1) + || (bitpos % GET_MODE_ALIGNMENT (mode1) != 0)))) && ((modifier == EXPAND_CONST_ADDRESS || modifier == EXPAND_INITIALIZER) ? STRICT_ALIGNMENT diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 10d1d8e..417272f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2003-12-01 Eric Botcazou <ebotcazou@libertysurf.fr> + + * gcc.dg/unaligned-1.c: New test. + 2003-11-30 Mark Mitchell <mark@codesourcery.com> PR c++/9849 diff --git a/gcc/testsuite/gcc.dg/unaligned-1.c b/gcc/testsuite/gcc.dg/unaligned-1.c new file mode 100644 index 0000000..5df1b37 --- /dev/null +++ b/gcc/testsuite/gcc.dg/unaligned-1.c @@ -0,0 +1,49 @@ +/* PR middle-end/7847 */ +/* Originator: <jk@tools.de> */ +/* { dg-do run } */ + +/* This used to fail on SPARC at runtime because of + an unaligned memory access. */ + +typedef char int8_t; +typedef short int16_t; +typedef int int32_t; +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; + +typedef struct { + uint32_t address; + uint16_t size; +} __attribute__ ((packed)) sml_agl_data_t; + +typedef struct { + sml_agl_data_t data[9]; +} __attribute__ ((packed)) sml_agli_t; + +typedef struct { + sml_agli_t sml_agli; +} __attribute__ ((packed)) dsi_t; + +typedef struct { + int a; + dsi_t dsi_pack; +} dvd_priv_t; + +int dvd_read_sector(dvd_priv_t *d, unsigned char* data) +{ + int i, skip=0; + + for (i=0; i < 9; i++) + if ((skip=d->dsi_pack.sml_agli.data[i].address) != 0) + break; + + return skip; +} + +int main(void) +{ + static dvd_priv_t dvd_priv; + dvd_read_sector(&dvd_priv, 0); + return 0; +} |