Post push CI cleanup.

Author: mhightower83

cores/esp8266/umm_malloc/umm_local.c

@@ -162,14 +162,27 @@ size_t umm_block_size( void ) {
 #endif
 
 #if defined(UMM_STATS) || defined(UMM_STATS_FULL)
-// UMM_STATISTICS ummStats;
+
+#if defined(UMM_POISON_CHECK) || defined(UMM_POISON_CHECK_LITE)
+
+// Adjustment needed for free_blocks to express the number of bytes that can
+// actually be allocated.
+#define UMM_OVERHEAD_ADJUST \
+  (umm_block_size() + \
+  umm_block_size()/2 + \
+  UMM_POISON_SIZE_BEFORE + \
+  UMM_POISON_SIZE_AFTER + \
+  sizeof(UMM_POISONED_BLOCK_LEN_TYPE))
+#else
+#define UMM_OVERHEAD_ADJUST  (umm_block_size() + umm_block_size()/2)
+#endif
 
 // Keep complete call path in IRAM
 size_t umm_free_heap_size_lw( void ) {
   UMM_INIT_HEAP;
 
   umm_heap_context_t *_context = umm_get_current_heap();
-  return (size_t)_context->stats.free_blocks * sizeof(umm_block) - umm_block_size() - umm_block_size()/2;
+  return (size_t)_context->stats.free_blocks * sizeof(umm_block) - UMM_OVERHEAD_ADJUST;
 }
 #endif
 
@@ -231,7 +244,7 @@ size_t ICACHE_FLASH_ATTR umm_get_oom_count( void ) {
 
 size_t ICACHE_FLASH_ATTR umm_free_heap_size_lw_min( void ) {
   umm_heap_context_t *_context = umm_get_current_heap();
-  return (size_t)_context->stats.free_blocks_min * umm_block_size() - umm_block_size() - umm_block_size()/2;
+  return (size_t)_context->stats.free_blocks_min * umm_block_size() - UMM_OVERHEAD_ADJUST;
 }
 
 size_t ICACHE_FLASH_ATTR umm_free_heap_size_min_reset( void ) {
@@ -242,12 +255,12 @@ size_t ICACHE_FLASH_ATTR umm_free_heap_size_min_reset( void ) {
 
 size_t ICACHE_FLASH_ATTR umm_free_heap_size_min( void ) {
   umm_heap_context_t *_context = umm_get_current_heap();
-  return _context->stats.free_blocks_min * umm_block_size() - umm_block_size() - umm_block_size()/2;
+  return _context->stats.free_blocks_min * umm_block_size() - UMM_OVERHEAD_ADJUST;
 }
 
 size_t ICACHE_FLASH_ATTR umm_free_heap_size_isr_min( void ) {
   umm_heap_context_t *_context = umm_get_current_heap();
-  return _context->stats.free_blocks_isr_min * umm_block_size() - umm_block_size() - umm_block_size()/2;
+  return _context->stats.free_blocks_isr_min * umm_block_size() - UMM_OVERHEAD_ADJUST;
 }
 
 size_t ICACHE_FLASH_ATTR umm_get_max_alloc_size( void ) {

cores/esp8266/umm_malloc/umm_local.h

@@ -37,7 +37,7 @@
 
 
 #if defined(UMM_POISON_CHECK_LITE)
-static int check_poison_neighbors( unsigned short cur );
+static int check_poison_neighbors( umm_heap_context_t *_context, unsigned short cur );
 #endif
 
 

cores/esp8266/umm_malloc/umm_malloc_cfg.h

@@ -558,7 +558,7 @@ static inline void _critical_exit(UMM_TIME_STAT *p, uint32_t *saved_ps) {
    #  define POISON_CHECK() 1
    #  define POISON_CHECK_NEIGHBORS(c) \
      do {\
-       if(!check_poison_neighbors(c)) \
+       if(!check_poison_neighbors(_context, c)) \
          panic();\
      } while(false)
    #else

cores/esp8266/umm_malloc/umm_poison.c

@@ -135,7 +135,7 @@ static void *get_unpoisoned( void *v_ptr ) {
     umm_heap_context_t *_context = umm_get_ptr_context( v_ptr );
     if (NULL == _context) {
       panic();
-      return NULL:
+      return NULL;
     }
     /* Figure out which block we're in. Note the use of truncated division... */
     c = (((char *)ptr)-(char *)(&(_context->heap[0])))/sizeof(umm_block);

libraries/esp8266/examples/MMU48K/MMU48K.ino

@@ -21,17 +21,18 @@ static inline char get ## name(void *o) { \
 #if (MMU_IRAM_SIZE > 32*1024)
 uint32_t gobble[4 * 1024] IRAM_ATTR;
 constexpr size_t gobble_sz = sizeof(gobble);
-#endif
-
-#ifdef MMU_SEC_HEAP
+#elif defined(MMU_SEC_HEAP)
 uint32_t *gobble;
 size_t gobble_sz;
+#else
+uint32_t gobble[256] IRAM_ATTR;
+constexpr size_t gobble_sz = sizeof(gobble);
 #endif
 
 bool  isValid(uint32_t *probe) {
   bool rc = true;
   if (NULL == probe) {
-  	ets_uart_printf("\nNULL memory pointer %p ...\n", probe);
+    ets_uart_printf("\nNULL memory pointer %p ...\n", probe);
     return false;
   }
 
@@ -156,6 +157,7 @@ void setup() {
 }
 
 int* nullPointer = NULL;
+
 char *probe_b = (char *)gobble;
 short *probe_s = (short *)((uintptr_t)gobble);
 char *probe_c = (char *)0x40110000;

libraries/esp8266/examples/irammem/irammem.ino

@@ -1,7 +1,7 @@
 /*
    This sketch assumes you have selected IRAM as a Second Heap from
    the Arduino IDE tools menu.
- */
+*/
 
 #include <ESP8266WiFi.h>
 #include <umm_malloc/umm_malloc.h>

tests/host/common/MockEsp.cpp

@@ -227,7 +227,11 @@ uint32_t EspClass::getCycleCount()
     return (((uint64_t)t.tv_sec) * 1000000 + t.tv_usec) * (F_CPU / 1000000);
 }
 
-void EspClass::setInternalHeap()
+void EspClass::setDramHeap()
+{
+}
+
+void EspClass::setIramHeap()
 {
 }