esp8266: Store frozen modules in FlashROM.

pfalcon · pfalcon · commit 9d7b871f5896 · 2016-03-17T23:06:47.000+08:00
Requires special lexer to access their contents.
diff --git a/esp8266/Makefile b/esp8266/Makefile
@@ -55,6 +55,7 @@ SRC_C = \
 	main.c \
 	esp_mphal.c \
 	gccollect.c \
+	lexerstr32.c \
 	uart.c \
 	modpyb.c \
 	modpybpin.c \
diff --git a/esp8266/esp8266.ld b/esp8266/esp8266.ld
@@ -146,6 +146,8 @@ SECTIONS
         *.o(.rodata.mp_type_*) /* catches type: mp_obj_type_t */
         *.o(.rodata.*_locals_dict*) /* catches types: mp_obj_dict_t, mp_map_elem_t */
         *.o(.rodata.mp_module_*) /* catches types: mp_obj_module_t, mp_obj_dict_t, mp_map_elem_t */
+        */frozen.o(.rodata.mp_frozen_sizes) /* frozen modules */
+        */frozen.o(.rodata.mp_frozen_content) /* frozen modules */
 
         _irom0_text_end = ABSOLUTE(.);
     } >irom0_0_seg :irom0_0_phdr
diff --git a/esp8266/lexerstr32.c b/esp8266/lexerstr32.c
@@ -0,0 +1,69 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2016 Damien P. George
+ * Copyright (c) 2016 Paul Sokolovsky
+ *
+ * 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.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/lexer.h"
+
+#if MICROPY_ENABLE_COMPILER
+
+typedef struct _mp_lexer_str32_buf_t {
+    const uint32_t *src_cur;
+    uint32_t val;
+    uint8_t byte_off;
+} mp_lexer_str32_buf_t;
+
+STATIC mp_uint_t str32_buf_next_byte(mp_lexer_str32_buf_t *sb) {
+    byte c = sb->val & 0xff;
+    if (c == 0) {
+        return MP_LEXER_EOF;
+    }
+
+    if (++sb->byte_off > 3) {
+        sb->byte_off = 0;
+        sb->val = *sb->src_cur++;
+    } else {
+        sb->val >>= 8;
+    }
+
+    return c;
+}
+
+STATIC void str32_buf_free(mp_lexer_str32_buf_t *sb) {
+    m_del_obj(mp_lexer_str32_buf_t, sb);
+}
+
+mp_lexer_t *mp_lexer_new_from_str32(qstr src_name, const char *str, mp_uint_t len, mp_uint_t free_len) {
+    mp_lexer_str32_buf_t *sb = m_new_obj_maybe(mp_lexer_str32_buf_t);
+    if (sb == NULL) {
+        return NULL;
+    }
+    sb->byte_off = (uint32_t)str & 3;
+    sb->src_cur = (uint32_t*)(str - sb->byte_off);
+    sb->val = *sb->src_cur++ >> sb->byte_off * 8;
+    return mp_lexer_new(src_name, sb, (mp_lexer_stream_next_byte_t)str32_buf_next_byte, (mp_lexer_stream_close_t)str32_buf_free);
+}
+
+#endif // MICROPY_ENABLE_COMPILER
diff --git a/esp8266/mpconfigport.h b/esp8266/mpconfigport.h
@@ -51,6 +51,7 @@
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
 #define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_TERSE)
 #define MICROPY_MODULE_FROZEN       (1)
+#define MICROPY_MODULE_FROZEN_LEXER mp_lexer_new_from_str32
 
 #define MICROPY_EVENT_POLL_HOOK {ets_event_poll();}
 
