Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix pgmspace 32-bit read macros #5425

Merged
merged 2 commits into from
Dec 3, 2018
Merged

Fix pgmspace 32-bit read macros #5425

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4477fe7
Fix pgmspace 32-bit read macros
earlephilhower Dec 3, 2018
2659d68
Merge branch 'master' into newlibfixes
devyte Dec 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tools/sdk/libc/xtensa-lx106-elf/include/sys/pgmspace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ static inline uint16_t pgm_read_word_inlined(const void* addr) {
#define pgm_read_byte(addr) pgm_read_byte_inlined(addr)
#define pgm_read_word(addr) pgm_read_word_inlined(addr)
#ifdef __cplusplus
#define pgm_read_dword(addr) (*reinterpret_cast<const uint32_t*)(addr)>
#define pgm_read_float(addr) (*reinterpret_cast<const float)(addr)>
#define pgm_read_ptr(addr) (*reinterpret_cast<const void const *)(addr)>
#define pgm_read_dword(addr) (*reinterpret_cast<const uint32_t*>(addr))
#define pgm_read_float(addr) (*reinterpret_cast<const float>(addr))
#define pgm_read_ptr(addr) (*reinterpret_cast<const void*>(addr))
#else
#define pgm_read_dword(addr) (*(const uint32_t*)(addr))
#define pgm_read_float(addr) (*(const float)(addr))
#define pgm_read_ptr(addr) (*(const void const *)(addr))
#define pgm_read_ptr(addr) (*(const void*)(addr))
#endif

#define pgm_read_byte_near(addr) pgm_read_byte(addr)
Expand Down