diff options
| author | gjl <gjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-04-23 10:23:04 +0000 |
|---|---|---|
| committer | gjl <gjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-04-23 10:23:04 +0000 |
| commit | 6222cbcc3d122b313e1ab96d790a23102e21999a (patch) | |
| tree | a7819562cfcd237347ebd5b034874073237bb3a2 | |
| parent | 104619f5d55218d7c8fd80baf909097a62b4c7df (diff) | |
* doc/extend.texi (AVR Named Address Spaces): Fix typos.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@186697 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/doc/extend.texi | 17 |
2 files changed, 13 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9673a1ef37f..651bcd9d8a5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2012-04-23 Georg-Johann Lay <avr@gjlay.de> + + * doc/extend.texi (AVR Named Address Spaces): Fix typos. + 2012-04-23 Richard Guenther <rguenther@suse.de> PR c/53060 diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi index dd08845fb9b..53391fa48b0 100644 --- a/gcc/doc/extend.texi +++ b/gcc/doc/extend.texi @@ -1311,18 +1311,18 @@ support is available or not: #ifdef __FLASH const __flash int var = 1; -int read_i (void) +int read_var (void) @{ - return i; + return var; @} #else -#include <avr/pgmspace.h> /* From avr-libc */ +#include <avr/pgmspace.h> /* From AVR-LibC */ const int var PROGMEM = 1; -int read_i (void) +int read_var (void) @{ - return (int) pgm_read_word (&i); + return (int) pgm_read_word (&var); @} #endif /* __FLASH */ @end example @@ -1332,7 +1332,8 @@ locates data in flash but accesses to these data will read from generic address space, i.e.@: from RAM, so that you need special accessors like @code{pgm_read_byte} -from @w{@uref{http://nongnu.org/avr-libc/user-manual,avr-libc}}. +from @w{@uref{http://nongnu.org/avr-libc/user-manual,AVR-LibC}} +together with attribute @code{progmem}. @b{Limitations and caveats} @@ -1345,7 +1346,7 @@ supports reading across the 64@tie{}KiB flash segment boundaries is @code{__memx}. @item -If you use one if the @code{__flash@var{N}} address spaces +If you use one of the @code{__flash@var{N}} address spaces you will have to arrange your linker skript to locate the @code{.progmem@var{N}.data} sections according to your needs. @@ -4782,7 +4783,7 @@ of the data but not how this data is accessed. In order to read data located with the @code{progmem} attribute (inline) assembler must be used. @example -/* Use custom macros from @w{@uref{http://nongnu.org/avr-libc/user-manual,avr-libc}} */ +/* Use custom macros from @w{@uref{http://nongnu.org/avr-libc/user-manual,AVR-LibC}} */ #include <avr/pgmspace.h> /* Locate var in flash memory */ |