Style corrections

Added MMU_ qualifier to new defines. Moved changes into their own file. Don't know how to fix platformio issue.
esp8266 · d-a-v · Dec 6, 2020 · Feb 4, 2020 · Feb 4, 2020 · Feb 7, 2020
commit 57043bd41aac0961627b9daf4a1831edb57683a7
diff --git a/boards.txt b/boards.txt
diff --git a/cores/esp8266/Arduino.h b/cores/esp8266/Arduino.h
@@ -246,6 +246,10 @@ const int TIM_DIV265 __attribute__((deprecated, weak)) = TIM_DIV256;
 #include "Updater.h"
 #include "debug.h"
 
+
+#include "mmu_iram.h"
+
+
 using std::min;
 using std::max;
 using std::isinf;

diff --git a/cores/esp8266/core_esp8266_features.cpp b/cores/esp8266/core_esp8266_features.cpp
@@ -21,7 +21,6 @@
 */
 
 #include <stdint.h>
-#include <c_types.h>
 
 /* precache()
  *  pre-loads flash data into the flash cache
@@ -46,33 +45,6 @@ void precache(void *f, uint32_t bytes) {
   (void)x;
 }
    <
9E88
span class='blob-code-inner blob-code-marker ' data-code-marker=" ">
-
-
-int Cache_Read_Enable_status = -1;
-
-#if (ICACHE_SIZE == 0x4000)
-#define SOC_CACHE_SIZE 0 // 16KB
-// #define SOC_CACHE_SIZE 1 // 32KB
-
-#pragma message("ICACHE size 16K")
-
-
-#ifndef ROM_Cache_Read_Enable
-#define ROM_Cache_Read_Enable         0x40004678
-#endif
-
-typedef void (*fp_Cache_Read_Enable_t)(uint32_t map, uint32_t p, uint32_t v);
-constexpr fp_Cache_Read_Enable_t real_Cache_Read_Enable = (fp_Cache_Read_Enable_t)ROM_Cache_Read_Enable;
-/*
- * Override SDK's ICACHE size
- */
-void IRAM_ATTR Cache_Read_Enable(uint32_t map, uint32_t p, uint32_t v) {
-  (void)v;
-  real_Cache_Read_Enable(map, p, SOC_CACHE_SIZE);
-  Cache_Read_Enable_status = SOC_CACHE_SIZE;
-}
-#endif
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/cores/esp8266/core_esp8266_features.h b/cores/esp8266/core_esp8266_features.h
@@ -112,9 +112,6 @@ extern "C" {
 
 void precache(void *f, uint32_t bytes);
 
-void Cache_Read_Enable(uint32_t map, uint32_t p, uint32_t v);
-extern int Cache_Read_Enable_status;
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/cores/esp8266/mmu_iram.cpp b/cores/esp8266/mmu_iram.cpp
@@ -0,0 +1,52 @@
+/*
+ *   Copyright 2020 M Hightower
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+#include "Arduino.h"
+#include "mmu_iram.h"
+
+extern "C" {
+
+int Cache_Read_Enable_status = -1;
+
+mmu_cre_status_t mmu_status __attribute__((section(".noinit")));
+
+#if (MMU_ICACHE_SIZE == 0x4000)
+#define SOC_CACHE_SIZE 0 // 16KB
+// #define SOC_CACHE_SIZE 1 // 32KB
+
+#pragma message("ICACHE size 16K")
+
+
+#ifndef ROM_Cache_Read_Enable
+#define ROM_Cache_Read_Enable         0x40004678
+#endif
+
+typedef void (*fp_Cache_Read_Enable_t)(uint8_t map, uint8_t p, uint8_t v);
+constexpr fp_Cache_Read_Enable_t real_Cache_Read_Enable = (fp_Cache_Read_Enable_t)ROM_Cache_Read_Enable;
+/*
+ * Override SDK's ICACHE size
+ */
+void IRAM_ATTR Cache_Read_Enable(uint8_t map, uint8_t p, uint8_t v) {
+  mmu_status.map = map;
+  mmu_status.p = p;
+  mmu_status.v = v;
+  real_Cache_Read_Enable(map, p, SOC_CACHE_SIZE);
+  mmu_status.v_cfg = SOC_CACHE_SIZE;
+  Cache_Read_Enable_status = SOC_CACHE_SIZE;
+}
+#endif
+
+};
diff --git a/cores/esp8266/mmu_iram.h b/cores/esp8266/mmu_iram.h
@@ -0,0 +1,40 @@
+/*
+ *   Copyright 2020 M Hightower
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+#ifndef MMU_IRAM_H
+#define MMU_IRAM_H
+
+#include <stdint.h>
+#include <c_types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct MMU_CRE_STATUS {
+  uint32_t v_cfg;
+  uint32_t map;
+  uint32_t p;
+  uint32_t v;
+}  mmu_cre_status_t;
+
+extern mmu_cre_status_t mmu_status;
+extern int Cache_Read_Enable_status;
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/libraries/esp8266/examples/MMU48K/MMU48K.ino b/libraries/esp8266/examples/MMU48K/MMU48K.ino
@@ -8,14 +8,14 @@
 
 */
 
-#if (IRAM_SIZE > 32*1024)
+#if (MMU_IRAM_SIZE > 32*1024)
 uint32_t gobble[4 * 1024] IRAM_ATTR;
 constexpr size_t gobble_sz = sizeof(gobble);
 #endif
 
-#ifdef SEC_HEAP
-constexpr uint32_t *gobble = (uint32_t *)SEC_HEAP;
-constexpr size_t gobble_sz = SEC_HEAP_SIZE;
+#ifdef MMU_SEC_HEAP
+constexpr
F987
 uint32_t *gobble = (uint32_t *)MMU_SEC_HEAP;
+constexpr size_t gobble_sz = MMU_SEC_HEAP_SIZE;
 #endif
 
 bool  isValid(uint32_t *probe) {
@@ -25,7 +25,7 @@ bool  isValid(uint32_t *probe) {
   uint32_t saveData = *probe;
   for (size_t i = 0; i < 32; i++) {
     *probe = BIT(i);
-    asm volatile ("" ::: "memory");
+    asm volatile("" ::: "memory");
     uint32_t val = *probe;
     if (val != BIT(i)) {
       ets_uart_printf("  Read 0x%08X != Wrote 0x%08X\n", val, (uint32_t)BIT(i));
@@ -60,33 +60,41 @@ void setup() {
   WiFi.mode(WIFI_OFF);
   Serial.begin(115200);
   delay(20);
-  Serial.printf_P(PSTR("\n\nI am Alive!\n"));
+  Serial.printf_P(PSTR("\n\nSetup ...\n"));
 
   Serial.printf_P(PSTR("\nMMU Configuration\n"));
   Serial.printf_P(PSTR("  Cache_Read_Enable status %d\n"), Cache_Read_Enable_status);
-#ifdef ICACHE_SIZE
-  Serial.printf_P(PSTR("  ICACHE Size:             %u\n"), ICACHE_SIZE);
+#ifdef MMU_ICACHE_SIZE
+  Serial.printf_P(PSTR("  ICACHE Size:             %u\n"), MMU_ICACHE_SIZE);
 #endif
-#ifdef IRAM_SIZE
-  Serial.printf_P(PSTR("  IRAM Size:               %u\n"), IRAM_SIZE);
+#ifdef MMU_IRAM_SIZE
+  Serial.printf_P(PSTR("  IRAM Size:               %u\n"), MMU_IRAM_SIZE);
 #endif
-#ifdef SEC_HEAP
-  Serial.printf_P(PSTR("  Secondary Heap at:       %p\n"), SEC_HEAP);
-  Serial.printf_P(PSTR("  Secondary Heap Size:     %u\n"), SEC_HEAP_SIZE);
+#ifdef MMU_SEC_HEAP
+  Serial.printf_P(PSTR("  Secondary Heap at:       %p\n"), MMU_SEC_HEAP);
+  Serial.printf_P(PSTR("  Secondary Heap Size:     %u\n"), MMU_SEC_HEAP_SIZE);
 #endif
+  constexpr uint32_t volatile *dport_ = (uint32_t volatile *)0x3FF00000;
+  uint32_t dport_6 = dport_[9];
+  if (0 == (dport_6 & 0x10)) {
+    Serial.printf_P(PSTR("  IRAM block mapped to:    0x40108000\n"));
+  }
+  if (0 == (dport_6 & 0x08)) {
+    Serial.printf_P(PSTR("  IRAM block mapped to:    0x4010C000\n"));
+  }
 
-#if (IRAM_SIZE > 0x8000) || defined(SEC_HEAP)
+#if (MMU_IRAM_SIZE > 0x8000) || defined(MMU_SEC_HEAP)
   if (isValid(gobble)) {
     // Put something in our new memory
-    for (size_t i = 0; i < (gobble_sz/4); i++) {
+    for (size_t i = 0; i < (gobble_sz / 4); i++) {
       gobble[i] = (uint32_t)&gobble[i];
     }
   }
 
   // Now is it there?
   dump_mem(gobble, 32);
-  dump_mem(&gobble[gobble_sz/4/2], 32);
-  dump_mem(&gobble[gobble_sz/4 - 32], 32);
+  dump_mem(&gobble[gobble_sz / 4 / 2], 32);
+  dump_mem(&gobble[gobble_sz / 4 - 32], 32);
 #endif
 
   // Lets peak over the edge

diff --git a/tools/boards.txt.py b/tools/boards.txt.py
@@ -1190,11 +1190,11 @@
 
     'mmu_menu': collections.OrderedDict([
         ( '.menu.mmu.3232', '32KB cache + 32KB IRAM (balanced)' ),
-        ( '.menu.mmu.3232.build.mmuflags', '-DIRAM_SIZE=0x8000 -DICACHE_SIZE=0x8000'),
+        ( '.menu.mmu.3232.build.mmuflags', '-DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x8000'),
         ( '.menu.mmu.4816', '16KB cache + 48KB IRAM (IRAM)' ),
-        ( '.menu.mmu.4816.build.mmuflags', '-DIRAM_SIZE=0
F438
xC000 -DICACHE_SIZE=0x4000' ),
+        ( '.menu.mmu.4816.build.mmuflags', '-DMMU_IRAM_SIZE=0xC000 -DMMU_ICACHE_SIZE=0x4000' ),
         ( '.menu.mmu.3216', '16KB cache + 32KB IRAM + 16KB sec heap (Heap)' ),
-        ( '.menu.mmu.3216.build.mmuflags', '-DIRAM_SIZE=0x8000 -DICACHE_SIZE=0x4000 -DSEC_HEAP=0x40108000 -DSEC_HEAP_SIZE=0x4000' ),
+        ( '.menu.mmu.3216.build.mmuflags', '-DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x4000 -DMMU_SEC_HEAP=0x40108000 -DMMU_SEC_HEAP_SIZE=0x4000' ),
         ]),
 
     }
@@ -1367,7 +1367,7 @@ def flash_map (flashsize_kb, fs_kb = 0):
         print("{")
         print("  dport0_0_seg :                        org = 0x3FF00000, len = 0x10")
         print("  dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000")
-        print("  iram1_0_seg :                         org = 0x40100000, len = IRAM_SIZE")
+        print("  iram1_0_seg :                         org = 0x40100000, len = MMU_IRAM_SIZE")
         print("  irom0_0_seg :                         org = 0x40201010, len = 0x%x" % max_upload_size)
         print("}")
         print("")

diff --git a/tools/sdk/ld/eagle.flash.16m14m.ld.h b/tools/sdk/ld/eagle.flash.16m14m.ld.h
@@ -10,7 +10,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = IRAM_SIZE
+  iram1_0_seg :                         org = 0x40100000, len = MMU_IRAM_SIZE
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 

diff --git a/tools/sdk/ld/eagle.flash.16m15m.ld.h b/tools/sdk/ld/eagle.flash.16m15m.ld.h
@@ -10,7 +10,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = IRAM_SIZE
+  iram1_0_seg :                         org = 0x40100000, len = MMU_IRAM_SIZE
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 

diff --git a/tools/sdk/ld/eagle.flash.1m.ld.h b/tools/sdk/ld/eagle.flash.1m.ld.h
@@ -10,7 +10,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = IRAM_SIZE
+  iram1_0_seg :                         org = 0x40100000, len = MMU_IRAM_SIZE
   irom0_0_seg :                         org = 0x40201010, len = 0xf9ff0
 }
 

diff --git a/tools/sdk/ld/eagle.flash.1m128.ld.h b/tools/sdk/ld/eagle.flash.1m128.ld.h
@@ -10,7 +10,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = IRAM_SIZE
+  iram1_0_seg :                         org = 0x40100000, len = MMU_IRAM_SIZE
   irom0_0_seg :                         org = 0x40201010, len = 0xd9ff0
 }
 

diff --git a/tools/sdk/ld/eagle.flash.1m144.ld.h b/tools/sdk/ld/eagle.flash.1m144.ld.h
@@ -10,7 +10,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = IRAM_SIZE
+  iram1_0_seg :                         org = 0x40100000, len = MMU_IRAM_SIZE
   irom0_0_seg :                         org = 0x40201010, len = 0xd5ff0
 }
 

diff --git a/tools/sdk/ld/eagle.flash.1m160.ld.h b/tools/sdk/ld/eagle.flash.1m160.ld.h
@@ -10,7 +10,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = IRAM_SIZE
+  iram1_0_seg :                         org = 0x40100000, len = MMU_IRAM_SIZE
   irom0_0_seg :                         org = 0x40201010, len = 0xd1ff0
 }
 

diff --git a/tools/sdk/ld/eagle.flash.1m192.ld.h b/tools/sdk/ld/eagle.flash.1m192.ld.h
@@ -10,7 +10,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = IRAM_SIZE
+  iram1_0_seg :                         org = 0x40100000, len = MMU_IRAM_SIZE
   irom0_0_seg :                         org = 0x40201010, len = 0xc9ff0
 }
 

diff --git a/tools/sdk/ld/eagle.flash.1m256.ld.h b/tools/sdk/ld/eagle.flash.1m256.ld.h
@@ -10,7 +10,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = IRAM_SIZE
+  iram1_0_seg :                         org = 0x40100000, len = MMU_IRAM_SIZE
   irom0_0_seg :                         org = 0x40201010, len = 0xb9ff0
 }
 

diff --git a/tools/sdk/ld/eagle.flash.1m512.ld.h b/tools/sdk/ld/eagle.flash.1m512.ld.h
@@ -10,7 +10,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = IRAM_SIZE
+  iram1_0_seg :                         org = 0x40100000, len = MMU_IRAM_SIZE
   irom0_0_seg :                         org = 0x40201010, len = 0x79ff0
 }
 

diff --git a/tools/sdk/ld/eagle.flash.1m64.ld.h b/tools/sdk/ld/eagle.flash.1m64.ld.h
@@ -10,7 +10,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = IRAM_SIZE
+  iram1_0_seg :                         org = 0x40100000, len = MMU_IRAM_SIZE
   irom0_0_seg :                         org = 0x40201010, len = 0xe9ff0
 }
 

diff --git a/tools/sdk/ld/eagle.flash.2m.ld.h b/tools/sdk/ld/eagle.flash.2m.ld.h
@@ -10,7 +10,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = IRAM_SIZE
+  iram1_0_seg :                         org = 0x40100000, len = MMU_IRAM_SIZE
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 

diff --git a/tools/sdk/ld/eagle.flash.2m128.ld.h b/tools/sdk/ld/eagle.flash.2m128.ld.h
@@ -10,7 +10,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = IRAM_SIZE
+  iram1_0_seg :                         org = 0x40100000, len = MMU_IRAM_SIZE
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 

diff --git a/tools/sdk/ld/eagle.flash.2m1m.ld.h b/tools/sdk/ld/eagle.flash.2m1m.ld.h
@@ -10,7 +10,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = IRAM_SIZE
+  iram1_0_seg :                         org = 0x40100000, len = MMU_IRAM_SIZE
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 

diff --git a/tools/sdk/ld/eagle.flash.2m256.ld.h b/tools/sdk/ld/eagle.flash.2m256.ld.h
@@ -10,7 +10,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = IRAM_SIZE
+  iram1_0_seg :                         org = 0x40100000, len = MMU_IRAM_SIZE
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 

diff --git a/tools/sdk/ld/eagle.flash.2m512.ld.h b/tools/sdk/ld/eagle.flash.2m512.ld.h
@@ -10,7 +10,7 @@ MEMORY
 {
   dport0_0_seg :                        org = 0x3FF00000, len = 0x10
   dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
-  iram1_0_seg :                         org = 0x40100000, len = IRAM_SIZE
+  iram1_0_seg :                         org = 0x40100000, len = MMU_IRAM_SIZE
   irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }