Skip to content

Move all PSTRs to own section, allow string dedup #6565

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

Merged
merged 6 commits into from
Sep 30, 2019
Merged

Move all PSTRs to own section, allow string dedup #6565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2dc794e
Move all PSTRs to own section, allow string dedup
earlephilhower Sep 28, 2019
38ca901
Merge branch 'master' into pstr-coalescing
earlephilhower Sep 28, 2019
52e4af9
Give each PSTR its own segment
earlephilhower Sep 28, 2019
0728f1d
Allow disposing of unused strings before merging
earlephilhower Sep 28, 2019
1206261
Merge branch 'master' into pstr-coalescing
d-a-v Sep 29, 2019
eb08305
Merge branch 'master' into pstr-coalescing
d-a-v Sep 30, 2019
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
3 changes: 3 additions & 0 deletions tools/sdk/ld/eagle.app.v6.common.ld.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,9 @@ SECTIONS
*libwps.a:(.literal.* .text.*)
*(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom0.text.* .irom.text .irom.text.*)

/* Constant strings in flash (PSTRs) */
*(.irom0.pstr.*)

/* __FUNCTION__ locals */
*(.rodata._ZZ*__FUNCTION__)
*(.rodata._ZZ*__PRETTY_FUNCTION__)
Expand Down
8 changes: 7 additions & 1 deletion 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 @@ -23,6 +23,7 @@ extern "C" {
// Ref: https://gcc.gnu.org/onlinedocs/gcc-3.2/gcc/Variable-Attributes.html
// Place each progmem object into its own named section, avoiding conflicts
#define PROGMEM __attribute__((section( "\".irom.text." __FILE__ "." __STRINGIZE(__LINE__) "." __STRINGIZE(__COUNTER__) "\"")))
#define PROGMEM_PSTR "\".irom0.pstr." __FILE__ "." __STRINGIZE(__LINE__) "." __STRINGIZE(__COUNTER__) "\""
#endif
#ifndef PGM_P
#define PGM_P const char *
Expand All @@ -34,7 +35,12 @@ extern "C" {
// PSTR() macro modified to start on a 32-bit boundary. This adds on average
// 1.5 bytes/string, but in return memcpy_P and strcpy_P will work 4~8x faster
#ifndef PSTR
#define PSTR(s) (__extension__({static const char __c[] __attribute__((__aligned__(4))) PROGMEM = (s); &__c[0];}))
// Adapted from AVR-specific code at https://forum.arduino.cc/index.php?topic=194603.0
#define PSTR(str) (__extension__({ \
PGM_P ptr; \
asm volatile ( ".pushsection " PROGMEM_PSTR ", \"aSM\", @progbits, 1 \n .align 4 \n 0: .string " __STRINGIZE(str) "\n .popsection \n" ); \
asm volatile ( "movi %0, 0b" : "=r" (ptr) ); \
ptr; }))
#endif

// Flash memory must be read using 32 bit aligned addresses else a processor
Expand Down