alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-15 22:44:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

1. Fix backtrace is incomplete

Browse Source 
2. Optimization code style
This commit is contained in:
Li Shuai
2019-08-14 16:07:24 +08:00
committed by jiangguangming
parent 653d8b5bdd
commit bd29202520
7 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/soc/src/memory_layout_utils.c
View File

@@ -127,13 +127,14 @@ size_t soc_get_available_memory_regions(soc_memory_region_t *regions)
bool move_to_next = true;
for (size_t i = 0; i < num_reserved; i++) {
if (reserved[i].end <= in_start) {
/* reserved region ends before 'in' starts */
continue;
if (reserved[i].start >= SOC_DRAM_HIGH && in_end < SOC_DRAM_HIGH && in.iram_address != 0) {
reserved[i].start = reserved[i].start - (in.iram_address - in.start);
reserved[i].end = reserved[i].end - (in.iram_address - in.start);
}
else if (reserved[i].start >= in_end) {
/* reserved region starts after 'in' ends */
break;
if (reserved[i].end <= in_start || reserved[i].start >= in_end) {
/* reserved region ends before 'in' starts or reserved region starts after 'in' ends */
continue;
}
else if (reserved[i].start <= in_start &&
reserved[i].end >= in_end) { /* reserved covers all of 'in' */