arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-01 03:26:58 +03:00
Code Activity

Move some code to flash and fix prototypes

Browse Source
This commit is contained in:
Ivan Grokhotkov
2014-12-01 00:34:59 +03:00
parent ea599139d5
commit 160f99c31c
5 changed files with 190 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

216
cores/esp8266/WString.cpp
View File

@ -25,38 +25,39 @@ extern "C" {
#include "osapi.h"
#include "ets_sys.h"
#include "mem.h"
#include "c_types.h"
}
/*********************************************/
/* Constructors */
/*********************************************/
String::String(const char *cstr)
ICACHE_FLASH_ATTR String::String(const char *cstr)
{
init();
if (cstr) copy(cstr, strlen(cstr));
}
String::String(const String &value)
ICACHE_FLASH_ATTR String::String(const String &value)
{
init();
*this = value;
}
#ifdef __GXX_EXPERIMENTAL_CXX0X__
String::String(String &&rval)
ICACHE_FLASH_ATTR String::String(String &&rval)
{
init();
move(rval);
}
String::String(StringSumHelper &&rval)
ICACHE_FLASH_ATTR String::String(StringSumHelper &&rval)
{
init();
move(rval);
}
#endif
String::String(char c)
ICACHE_FLASH_ATTR String::String(char c)
{
init();
char buf[2];
@ -65,7 +66,7 @@ String::String(char c)
*this = buf;
}
String::String(unsigned char value, unsigned char base)
ICACHE_FLASH_ATTR String::String(unsigned char value, unsigned char base)
{
init();
char buf[1 + 8 * sizeof(unsigned char)];
@ -73,7 +74,7 @@ String::String(unsigned char value, unsigned char base)
*this = buf;
}
String::String(int value, unsigned char base)
ICACHE_FLASH_ATTR String::String(int value, unsigned char base)
{
init();
char buf[2 + 8 * sizeof(int)];
@ -81,7 +82,7 @@ String::String(int value, unsigned char base)
*this = buf;
}
String::String(unsigned int value, unsigned char base)
ICACHE_FLASH_ATTR String::String(unsigned int value, unsigned char base)
{
init();
char buf[1 + 8 * sizeof(unsigned int)];
@ -89,7 +90,7 @@ String::String(unsigned int value, unsigned char base)
*this = buf;
}
String::String(long value, unsigned char base)
ICACHE_FLASH_ATTR String::String(long value, unsigned char base)
{
init();
char buf[2 + 8 * sizeof(long)];
@ -97,7 +98,7 @@ String::String(long value, unsigned char base)
*this = buf;
}
String::String(unsigned long value, unsigned char base)
ICACHE_FLASH_ATTR String::String(unsigned long value, unsigned char base)
{
init();
char buf[1 + 8 * sizeof(unsigned long)];
@ -105,28 +106,28 @@ String::String(unsigned long value, unsigned char base)
*this = buf;
}
String::String(float value, unsigned char decimalPlaces)
ICACHE_FLASH_ATTR String::String(float value, unsigned char decimalPlaces)
{
init();
char buf[33];
*this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf);
}
String::String(double value, unsigned char decimalPlaces)
ICACHE_FLASH_ATTR String::String(double value, unsigned char decimalPlaces)
{
init();
char buf[33];
*this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf);
}
String::~String()
ICACHE_FLASH_ATTR String::~String()
{
free(buffer);
os_free(buffer);
}
/*********************************************/
/* Memory Management */
/*********************************************/
// /*********************************************/
// /* Memory Management */
// /*********************************************/
inline void String::init(void)
{
@ -135,14 +136,14 @@ inline void String::init(void)
len = 0;
}
void String::invalidate(void)
void ICACHE_FLASH_ATTR String::invalidate(void)
{
if (buffer) free(buffer);
if (buffer) os_free(buffer);
buffer = NULL;
capacity = len = 0;
}
unsigned char String::reserve(unsigned int size)
unsigned char ICACHE_FLASH_ATTR String::reserve(unsigned int size)
{
if (buffer && capacity >= size) return 1;
if (changeBuffer(size)) {
@ -152,9 +153,9 @@ unsigned char String::reserve(unsigned int size)
return 0;
}
unsigned char String::changeBuffer(unsigned int maxStrLen)
unsigned char ICACHE_FLASH_ATTR String::changeBuffer(unsigned int maxStrLen)
{
char *newbuffer = (char *)realloc(buffer, maxStrLen + 1);
char *newbuffer = (char *)os_realloc(buffer, maxStrLen + 1);
if (newbuffer) {
buffer = newbuffer;
capacity = maxStrLen;
@ -163,11 +164,11 @@ unsigned char String::changeBuffer(unsigned int maxStrLen)
return 0;
}
/*********************************************/
/* Copy and Move */
/*********************************************/
// /*********************************************/
// /* Copy and Move */
// /*********************************************/
String & String::copy(const char *cstr, unsigned int length)
String & ICACHE_FLASH_ATTR String::copy(const char *cstr, unsigned int length)
{
if (!reserve(length)) {
invalidate();
@ -180,7 +181,7 @@ String & String::copy(const char *cstr, unsigned int length)
#ifdef __GXX_EXPERIMENTAL_CXX0X__
void String::move(String &rhs)
void ICACHE_FLASH_ATTR String::move(String &rhs)
{
if (buffer) {
if (capacity >= rhs.len) {
@ -189,7 +190,7 @@ void String::move(String &rhs)
rhs.len = 0;
return;
} else {
free(buffer);
os_free(buffer);
}
}
buffer = rhs.buffer;
@ -201,7 +202,7 @@ void String::move(String &rhs)
}
#endif
String & String::operator = (const String &rhs)
String & ICACHE_FLASH_ATTR String::operator = (const String &rhs)
{
if (this == &rhs) return *this;
@ -212,20 +213,20 @@ String & String::operator = (const String &rhs)
}
#ifdef __GXX_EXPERIMENTAL_CXX0X__
String & String::operator = (String &&rval)
String & ICACHE_FLASH_ATTR String::operator = (String &&rval)
{
if (this != &rval) move(rval);
return *this;
}
String & String::operator = (StringSumHelper &&rval)
String & ICACHE_FLASH_ATTR String::operator = (StringSumHelper &&rval)
{
if (this != &rval) move(rval);
return *this;
}
#endif
String & String::operator = (const char *cstr)
String & ICACHE_FLASH_ATTR String::operator = (const char *cstr)
{
if (cstr) copy(cstr, strlen(cstr));
else invalidate();
@ -234,16 +235,16 @@ String & String::operator = (const char *cstr)
}
/*********************************************/
/* concat */
/*********************************************/
// /*********************************************/
// /* concat */
// /*********************************************/
unsigned char String::concat(const String &s)
unsigned char ICACHE_FLASH_ATTR String::concat(const String &s)
{
return concat(s.buffer, s.len);
}
unsigned char String::concat(const char *cstr, unsigned int length)
unsigned char ICACHE_FLASH_ATTR String::concat(const char *cstr, unsigned int length)
{
unsigned int newlen = len + length;
if (!cstr) return 0;
@ -254,13 +255,13 @@ unsigned char String::concat(const char *cstr, unsigned int length)
return 1;
}
unsigned char String::concat(const char *cstr)
unsigned char ICACHE_FLASH_ATTR String::concat(const char *cstr)
{
if (!cstr) return 0;
return concat(cstr, strlen(cstr));
}
unsigned char String::concat(char c)
unsigned char ICACHE_FLASH_ATTR String::concat(char c)
{
char buf[2];
buf[0] = c;
@ -268,49 +269,49 @@ unsigned char String::concat(char c)
return concat(buf, 1);
}
unsigned char String::concat(unsigned char num)
unsigned char ICACHE_FLASH_ATTR String::concat(unsigned char num)
{
char buf[1 + 3 * sizeof(unsigned char)];
itoa(num, buf, 10);
return concat(buf, strlen(buf));
}
unsigned char String::concat(int num)
unsigned char ICACHE_FLASH_ATTR String::concat(int num)
{
char buf[2 + 3 * sizeof(int)];
itoa(num, buf, 10);
return concat(buf, strlen(buf));
}
unsigned char String::concat(unsigned int num)
unsigned char ICACHE_FLASH_ATTR String::concat(unsigned int num)
{
char buf[1 + 3 * sizeof(unsigned int)];
utoa(num, buf, 10);
return concat(buf, strlen(buf));
}
unsigned char String::concat(long num)
unsigned char ICACHE_FLASH_ATTR String::concat(long num)
{
char buf[2 + 3 * sizeof(long)];
ltoa(num, buf, 10);
return concat(buf, strlen(buf));
}
unsigned char String::concat(unsigned long num)
unsigned char ICACHE_FLASH_ATTR String::concat(unsigned long num)
{
char buf[1 + 3 * sizeof(unsigned long)];
ultoa(num, buf, 10);
return concat(buf, strlen(buf));
}
unsigned char String::concat(float num)
unsigned char ICACHE_FLASH_ATTR String::concat(float num)
{
char buf[20];
char* string = dtostrf(num, 4, 2, buf);
return concat(string, strlen(string));
}
unsigned char String::concat(double num)
unsigned char ICACHE_FLASH_ATTR String::concat(double num)
{
char buf[20];
char* string = dtostrf(num, 4, 2, buf);
@ -321,70 +322,70 @@ unsigned char String::concat(double num)
/* Concatenate */
/*********************************************/
StringSumHelper & operator + (const StringSumHelper &lhs, const String &rhs)
StringSumHelper & ICACHE_FLASH_ATTR operator + (const StringSumHelper &lhs, const String &rhs)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(rhs.buffer, rhs.len)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, const char *cstr)
StringSumHelper & ICACHE_FLASH_ATTR operator + (const StringSumHelper &lhs, const char *cstr)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!cstr || !a.concat(cstr, strlen(cstr))) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, char c)
StringSumHelper & ICACHE_FLASH_ATTR operator + (const StringSumHelper &lhs, char c)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(c)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, unsigned char num)
StringSumHelper & ICACHE_FLASH_ATTR operator + (const StringSumHelper &lhs, unsigned char num)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(num)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, int num)
StringSumHelper & ICACHE_FLASH_ATTR operator + (const StringSumHelper &lhs, int num)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(num)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, unsigned int num)
StringSumHelper & ICACHE_FLASH_ATTR operator + (const StringSumHelper &lhs, unsigned int num)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(num)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, long num)
StringSumHelper & ICACHE_FLASH_ATTR operator + (const StringSumHelper &lhs, long num)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(num)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long num)
StringSumHelper & ICACHE_FLASH_ATTR operator + (const StringSumHelper &lhs, unsigned long num)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(num)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, float num)
StringSumHelper & ICACHE_FLASH_ATTR operator + (const StringSumHelper &lhs, float num)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(num)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, double num)
StringSumHelper & ICACHE_FLASH_ATTR operator + (const StringSumHelper &lhs, double num)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(num)) a.invalidate();
@ -392,11 +393,11 @@ StringSumHelper & operator + (const StringSumHelper &lhs, double num)
}
/*********************************************/
/* Comparison */
/*********************************************/
// /*********************************************/
// /* Comparison */
// /*********************************************/
int String::compareTo(const String &s) const
int ICACHE_FLASH_ATTR String::compareTo(const String &s) const
{
if (!buffer || !s.buffer) {
if (s.buffer && s.len > 0) return 0 - *(unsigned char *)s.buffer;
@ -406,39 +407,39 @@ int String::compareTo(const String &s) const
return strcmp(buffer, s.buffer);
}
unsigned char String::equals(const String &s2) const
unsigned char ICACHE_FLASH_ATTR String::equals(const String &s2) const
{
return (len == s2.len && compareTo(s2) == 0);
}
unsigned char String::equals(const char *cstr) const
unsigned char ICACHE_FLASH_ATTR String::equals(const char *cstr) const
{
if (len == 0) return (cstr == NULL || *cstr == 0);
if (cstr == NULL) return buffer[0] == 0;
return strcmp(buffer, cstr) == 0;
}
unsigned char String::operator<(const String &rhs) const
unsigned char ICACHE_FLASH_ATTR String::operator<(const String &rhs) const
{
return compareTo(rhs) < 0;
}
unsigned char String::operator>(const String &rhs) const
unsigned char ICACHE_FLASH_ATTR String::operator>(const String &rhs) const
{
return compareTo(rhs) > 0;
}
unsigned char String::operator<=(const String &rhs) const
unsigned char ICACHE_FLASH_ATTR String::operator<=(const String &rhs) const
{
return compareTo(rhs) <= 0;
}
unsigned char String::operator>=(const String &rhs) const
unsigned char ICACHE_FLASH_ATTR String::operator>=(const String &rhs) const
{
return compareTo(rhs) >= 0;
}
unsigned char String::equalsIgnoreCase( const String &s2 ) const
unsigned char ICACHE_FLASH_ATTR String::equalsIgnoreCase( const String &s2 ) const
{
if (this == &s2) return 1;
if (len != s2.len) return 0;
@ -451,39 +452,39 @@ unsigned char String::equalsIgnoreCase( const String &s2 ) const
return 1;
}
unsigned char String::startsWith( const String &s2 ) const
unsigned char ICACHE_FLASH_ATTR String::startsWith( const String &s2 ) const
{
if (len < s2.len) return 0;
return startsWith(s2, 0);
}
unsigned char String::startsWith( const String &s2, unsigned int offset ) const
unsigned char ICACHE_FLASH_ATTR String::startsWith( const String &s2, unsigned int offset ) const
{
if (offset > len - s2.len || !buffer || !s2.buffer) return 0;
return strncmp( &buffer[offset], s2.buffer, s2.len ) == 0;
}
unsigned char String::endsWith( const String &s2 ) const
unsigned char ICACHE_FLASH_ATTR String::endsWith( const String &s2 ) const
{
if ( len < s2.len || !buffer || !s2.buffer) return 0;
return strcmp(&buffer[len - s2.len], s2.buffer) == 0;
}
/*********************************************/
/* Character Access */
/*********************************************/
// /*********************************************/
// /* Character Access */
// /*********************************************/
char String::charAt(unsigned int loc) const
char ICACHE_FLASH_ATTR String::charAt(unsigned int loc) const
{
return operator[](loc);
}
void String::setCharAt(unsigned int loc, char c)
void ICACHE_FLASH_ATTR String::setCharAt(unsigned int loc, char c)
{
if (loc < len) buffer[loc] = c;
}
char & String::operator[](unsigned int index)
char & ICACHE_FLASH_ATTR String::operator[](unsigned int index)
{
static char dummy_writable_char;
if (index >= len || !buffer) {
@ -493,13 +494,13 @@ char & String::operator[](unsigned int index)
return buffer[index];
}
char String::operator[]( unsigned int index ) const
char ICACHE_FLASH_ATTR String::operator[]( unsigned int index ) const
{
if (index >= len || !buffer) return 0;
return buffer[index];
}
void String::getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index) const
void ICACHE_FLASH_ATTR String::getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index) const
{
if (!bufsize || !buf) return;
if (index >= len) {
@ -512,16 +513,17 @@ void String::getBytes(unsigned char *buf, unsigned int bufsize, unsigned int ind
buf[n] = 0;
}
/*********************************************/
/* Search */
/*********************************************/
// /*********************************************/
// /* Search */
// /*********************************************/
ICACHE_FLASH_ATTR ICACHE_FLASH_ATTR
int String::indexOf(char c) const
int ICACHE_FLASH_ATTR String::indexOf(char c) const
{
return indexOf(c, 0);
}
int String::indexOf( char ch, unsigned int fromIndex ) const
int ICACHE_FLASH_ATTR String::indexOf( char ch, unsigned int fromIndex ) const
{
if (fromIndex >= len) return -1;
const char* temp = strchr(buffer + fromIndex, ch);
@ -529,12 +531,12 @@ int String::indexOf( char ch, unsigned int fromIndex ) const
return temp - buffer;
}
int String::indexOf(const String &s2) const
int ICACHE_FLASH_ATTR String::indexOf(const String &s2) const
{
return indexOf(s2, 0);
}
int String::indexOf(const String &s2, unsigned int fromIndex) const
int ICACHE_FLASH_ATTR String::indexOf(const String &s2, unsigned int fromIndex) const
{
if (fromIndex >= len) return -1;
const char *found = strstr(buffer + fromIndex, s2.buffer);
@ -542,12 +544,12 @@ int String::indexOf(const String &s2, unsigned int fromIndex) const
return found - buffer;
}
int String::lastIndexOf( char theChar ) const
int ICACHE_FLASH_ATTR String::lastIndexOf( char theChar ) const
{
return lastIndexOf(theChar, len - 1);
}
int String::lastIndexOf(char ch, unsigned int fromIndex) const
int ICACHE_FLASH_ATTR String::lastIndexOf(char ch, unsigned int fromIndex) const
{
if (fromIndex >= len) return -1;
char tempchar = buffer[fromIndex + 1];
@ -558,12 +560,12 @@ int String::lastIndexOf(char ch, unsigned int fromIndex) const
return temp - buffer;
}
int String::lastIndexOf(const String &s2) const
int ICACHE_FLASH_ATTR String::lastIndexOf(const String &s2) const
{
return lastIndexOf(s2, len - s2.len);
}
int String::lastIndexOf(const String &s2, unsigned int fromIndex) const
int ICACHE_FLASH_ATTR String::lastIndexOf(const String &s2, unsigned int fromIndex) const
{
if (s2.len == 0 || len == 0 || s2.len > len) return -1;
if (fromIndex >= len) fromIndex = len - 1;
@ -576,7 +578,7 @@ int String::lastIndexOf(const String &s2, unsigned int fromIndex) const
return found;
}
String String::substring(unsigned int left, unsigned int right) const
String ICACHE_FLASH_ATTR String::substring(unsigned int left, unsigned int right) const
{
if (left > right) {
unsigned int temp = right;
@ -593,11 +595,11 @@ String String::substring(unsigned int left, unsigned int right) const
return out;
}
/*********************************************/
/* Modification */
/*********************************************/
// /*********************************************/
// /* Modification */
// /*********************************************/
void String::replace(char find, char replace)
void ICACHE_FLASH_ATTR String::replace(char find, char replace)
{
if (!buffer) return;
for (char *p = buffer; *p; p++) {
@ -605,7 +607,7 @@ void String::replace(char find, char replace)
}
}
void String::replace(const String& find, const String& replace)
void ICACHE_FLASH_ATTR String::replace(const String& find, const String& replace)
{
if (len == 0 || find.len == 0) return;
int diff = replace.len - find.len;
@ -648,14 +650,14 @@ void String::replace(const String& find, const String& replace)
}
}
void String::remove(unsigned int index){
void ICACHE_FLASH_ATTR String::remove(unsigned int index){
// Pass the biggest integer as the count. The remove method
// below will take care of truncating it at the end of the
// string.
remove(index, (unsigned int)-1);
}
void String::remove(unsigned int index, unsigned int count){
void ICACHE_FLASH_ATTR String::remove(unsigned int index, unsigned int count){
if (index >= len) { return; }
if (count <= 0) { return; }
if (count > len - index) { count = len - index; }
@ -665,7 +667,7 @@ void String::remove(unsigned int index, unsigned int count){
buffer[len] = 0;
}
void String::toLowerCase(void)
void ICACHE_FLASH_ATTR String::toLowerCase(void)
{
if (!buffer) return;
for (char *p = buffer; *p; p++) {
@ -673,7 +675,7 @@ void String::toLowerCase(void)
}
}
void String::toUpperCase(void)
void ICACHE_FLASH_ATTR String::toUpperCase(void)
{
if (!buffer) return;
for (char *p = buffer; *p; p++) {
@ -681,7 +683,7 @@ void String::toUpperCase(void)
}
}
void String::trim(void)
void ICACHE_FLASH_ATTR String::trim(void)
{
if (!buffer || len == 0) return;
char *begin = buffer;
@ -693,18 +695,18 @@ void String::trim(void)
buffer[len] = 0;
}
/*********************************************/
/* Parsing / Conversion */
/*********************************************/
// /*********************************************/
// /* Parsing / Conversion */
// /*********************************************/
long String::toInt(void) const
long ICACHE_FLASH_ATTR String::toInt(void) const
{
if (buffer) return atol(buffer);
if (buffer) return atol_internal(buffer);
return 0;
}
float String::toFloat(void) const
float ICACHE_FLASH_ATTR String::toFloat(void) const
{
if (buffer) return float(atof(buffer));
if (buffer) return float(atof_internal(buffer));
return 0;
}