Merge branch 'master' into ssdp-fixes

Author: jeremyalangreen

cores/esp8266/Esp.cpp

@@ -466,15 +466,7 @@ bool EspClass::updateSketch(Stream& in, uint32_t size, bool restartOnFail, bool
     return true;
 }
 
-// Interrupts which are masked by flash access routines
-static const int FLASH_INT_MASK =
-    (1 << ETS_SLC_INUM) |
-    (1 << ETS_SPI_INUM) |
-    (1 << ETS_GPIO_INUM) |
-    (1 << ETS_UART_INUM) |
-    (1 << ETS_CCOMPARE0_INUM) |
-    (1 << ETS_FRC_TIMER1_INUM);
-    
+static const int FLASH_INT_MASK = ((B10 << 8) | B00111010);
 
 bool EspClass::flashEraseSector(uint32_t sector) {
     ets_isr_mask(FLASH_INT_MASK);

cores/esp8266/pgmspace.cpp

@@ -18,6 +18,10 @@
  */
 
 #include <ctype.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
+#include <stdarg.h>
 #include "pgmspace.h"
 
 size_t strnlen_P(PGM_P s, size_t size) {
@@ -26,6 +30,33 @@ size_t strnlen_P(PGM_P s, size_t size) {
     return (size_t) (cp - s);
 }
 
+char* strstr_P(const char* haystack, PGM_P needle)
+{
+    const char* pn = reinterpret_cast<const char*>(needle);
+    if (haystack[0] == 0) {
+        if (pgm_read_byte(pn)) {
+	        return NULL;
+        }
+        return (char*) haystack;
+    }
+
+    while (*haystack) {
+        size_t i = 0;
+        while (true) {
+            char n = pgm_read_byte(pn + i);
+            if (n == 0) {
+                return (char *) haystack;
+            }
+            if (n != haystack[i]) {
+                break;
+            }
+            ++i;
+        }
+        ++haystack;
+    }
+    return NULL;
+}
+
 void* memcpy_P(void* dest, PGM_VOID_P src, size_t count) {
     const uint8_t* read = reinterpret_cast<const uint8_t*>(src);
     uint8_t* write = reinterpret_cast<uint8_t*>(dest);
@@ -203,7 +234,7 @@ int printf_P(PGM_P formatP, ...) {
     char* format = new char[fmtLen + 1];
     strcpy_P(format, formatP);
 
-    ret = os_printf(format, arglist);
+    ret = printf(format, arglist);
 
     delete[] format;
 
@@ -240,7 +271,7 @@ int vsnprintf_P(char* str, size_t strSize, PGM_P formatP, va_list ap) {
     char* format = new char[fmtLen + 1];
     strcpy_P(format, formatP);
 
-    ret = ets_vsnprintf(str, strSize, format, ap);
+    ret = vsnprintf(str, strSize, format, ap);
 
     delete[] format;
 

cores/esp8266/pgmspace.h

@@ -1,11 +1,14 @@
 #ifndef __PGMSPACE_H_
 #define __PGMSPACE_H_
 
+#include <stdint.h>
+#include <stdio.h>
+
+#ifdef __ets__
+
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include <stdint.h>
-#include <stdio.h>
 #include "ets_sys.h"
 #include "osapi.h"
 #ifdef __cplusplus
@@ -16,6 +19,13 @@ extern "C" {
 #define PGM_P  		const char *
 #define PGM_VOID_P  const void *
 #define PSTR(s) (__extension__({static const char __c[] PROGMEM = (s); &__c[0];}))
+#else //__ets__
+#define PROGMEM
+#define PGM_P  		const char *
+#define PGM_VOID_P  const void *
+#define PSTR(s)     (s)
+
+#endif // __ets__
 
 
 #define _SFR_BYTE(n) (n)
@@ -62,6 +72,8 @@ int strncasecmp_P(const char* str1, PGM_P str2P, size_t size);
 size_t strnlen_P(PGM_P s, size_t size);
 #define strlen_P(strP)          strnlen_P((strP), SIZE_IRRELEVANT)
 
+char* strstr_P(const char* haystack, PGM_P needle);
+
 int	printf_P(PGM_P formatP, ...) __attribute__((format(printf, 1, 2)));
 int	sprintf_P(char *str, PGM_P formatP, ...) __attribute__((format(printf, 2, 3)));
 int	snprintf_P(char *str, size_t strSize, PGM_P formatP, ...) __attribute__((format(printf, 3, 4)));
@@ -74,6 +86,7 @@ int	vsnprintf_P(char *str, size_t strSize, PGM_P formatP, va_list ap) __attribut
 // b3, b2, b1, b0
 //     w1,     w0
 
+#ifdef __ets__
 #define pgm_read_byte(addr) 		                                           \
 (__extension__({                                                               \
     PGM_P __local = (PGM_P)(addr);  /* isolate varible for macro expansion */         \
@@ -91,6 +104,10 @@ int	vsnprintf_P(char *str, size_t strSize, PGM_P formatP, va_list ap) __attribut
     uint16_t __result = ((*__addr32) >> (__offset * 8));                       \
     __result;                                                                  \
 }))	
+#else //__ets__
+#define pgm_read_byte(addr)     (*reinterpret_cast<const uint8_t*>(addr))
+#define pgm_read_word(addr)     (*reinterpret_cast<const uint16_t*>(addr))
+#endif //__ets__
 
 #define pgm_read_dword(addr) 		(*reinterpret_cast<const uint32_t*>(addr))
 #define pgm_read_float(addr) 		(*reinterpret_cast<const float*>(addr))

tests/host/Makefile

@@ -17,6 +17,7 @@ CORE_CPP_FILES := $(addprefix $(CORE_PATH)/,\
 	Print.cpp \
 	FS.cpp \
 	spiffs_api.cpp \
+	pgmspace.cpp \
 )
 
 CORE_C_FILES := $(addprefix $(CORE_PATH)/,\
@@ -41,6 +42,7 @@ INC_PATHS += $(addprefix -I, \
 
 TEST_CPP_FILES := \
 	fs/test_fs.cpp \
+	core/test_pgmspace.cpp \
 
 CXXFLAGS += -std=c++11 -Wall -coverage -O0
 CFLAGS += -std=c99 -Wall -coverage -O0

tests/host/common/pgmspace.h

@@ -0,0 +1,55 @@
+/*
+ test_pgmspace.cpp - pgmspace tests
+ Copyright © 2016 Ivan Grokhotkov
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ */
+
+#include <catch.hpp>
+#include <string.h>
+#include <pgmspace.h>
+
+TEST_CASE("strstr_P works as strstr", "[core][pgmspace]")
+{
+    auto t = [](const char* h, const char* n) {
+        const char* strstr_P_result = strstr_P(h, n);
+        const char* strstr_result = strstr(h, n);
+        REQUIRE(strstr_P_result == strstr_result);
+    };
+
+    // Test case data is from avr-libc, original copyright (c) 2007  Dmitry Xmelkov
+    // See avr-libc/tests/simulate/pmstring/strstr_P.c
+    t ("", "");
+    t("12345", "");
+    t("ababac", "abac");
+    t("", "a");
+    t("b", "a");
+    t("a", "a");
+    t("abcbef", "a");
+    t(".a", "a");
+    t(".a.", "a");
+    t("ABCDEFGH", "H");
+    t("", "12");
+    t("13", "12");
+    t("32", "12");
+    t("12", "12");
+    t("123", "12");
+    t("012", "12");
+    t("01200", "12");
+    t("a_ab_abc_abcd_abcde", "abcdef");
+    t("a_ab_abc_abcd_abcde_abcdef", "abcdef");
+    t("aababcabcdabcde", "abcdef");
+    t("aababcabcdabcdeabcdef", "abcdef");
+    t("abaabaaabaaaab", "aaaaab");
+    t("abaabaaabaaaabaaaaab", "aaaaab");
+    t("_foo_foo", "foo");
+    t("A", "a");
+}

tests/host/core/test_pgmspace.cpp

@@ -32,8 +32,9 @@
 def compile(tmp_dir, sketch, tools_dir, hardware_dir, ide_path, f, args):
     cmd = ide_path + '/arduino-builder '
     cmd += '-compile -logger=human '
-    for lib_dir in args.library_path:
-        cmd += '-libraries "' + lib_dir + '" '
+    if args.library_path:
+        for lib_dir in args.library_path:
+            cmd += '-libraries "' + lib_dir + '" '
     cmd += '-build-path "' + tmp_dir + '" '
     cmd += '-hardware "' + ide_path + '/hardware" '
     cmd += '-hardware ' + hardware_dir + ' '