Commit 84b245f1 authored by Damien George's avatar Damien George
Browse files

lib/utils: Add pyexec_frozen_module to load and execute frozen module.

This is a convenience function similar to pyexec_file.  It should be used
instead of raw mp_parse_compile_execute because the latter does not catch
and report exceptions.
parent 7203b58e
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "py/runtime0.h" #include "py/runtime0.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "py/stackctrl.h" #include "py/stackctrl.h"
#include "py/frozenmod.h"
#include "py/mphal.h" #include "py/mphal.h"
#include "py/gc.h" #include "py/gc.h"
#include "lib/utils/pyexec.h" #include "lib/utils/pyexec.h"
...@@ -49,8 +48,7 @@ STATIC void mp_reset(void) { ...@@ -49,8 +48,7 @@ STATIC void mp_reset(void) {
mp_obj_list_init(mp_sys_path, 0); mp_obj_list_init(mp_sys_path, 0);
mp_obj_list_init(mp_sys_argv, 0); mp_obj_list_init(mp_sys_argv, 0);
#if MICROPY_MODULE_FROZEN #if MICROPY_MODULE_FROZEN
mp_lexer_t *lex = mp_find_frozen_module("main", 4); pyexec_frozen_module("main");
mp_parse_compile_execute(lex, MP_PARSE_FILE_INPUT, mp_globals_get(), mp_locals_get());
#endif #endif
} }
......
...@@ -27,12 +27,14 @@ ...@@ -27,12 +27,14 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <string.h>
#include "py/nlr.h" #include "py/nlr.h"
#include "py/compile.h" #include "py/compile.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "py/repl.h" #include "py/repl.h"
#include "py/gc.h" #include "py/gc.h"
#include "py/frozenmod.h"
#include "py/mphal.h" #include "py/mphal.h"
#if defined(USE_DEVICE_MODE) #if defined(USE_DEVICE_MODE)
#include "irq.h" #include "irq.h"
...@@ -476,6 +478,19 @@ int pyexec_file(const char *filename) { ...@@ -476,6 +478,19 @@ int pyexec_file(const char *filename) {
return parse_compile_execute(lex, MP_PARSE_FILE_INPUT, 0); return parse_compile_execute(lex, MP_PARSE_FILE_INPUT, 0);
} }
#if MICROPY_MODULE_FROZEN
int pyexec_frozen_module(const char *name) {
mp_lexer_t *lex = mp_find_frozen_module(name, strlen(name));
if (lex == NULL) {
printf("could not find module '%s'\n", name);
return false;
}
return parse_compile_execute(lex, MP_PARSE_FILE_INPUT, 0);
}
#endif
mp_obj_t pyb_set_repl_info(mp_obj_t o_value) { mp_obj_t pyb_set_repl_info(mp_obj_t o_value) {
repl_display_debugging_info = mp_obj_get_int(o_value); repl_display_debugging_info = mp_obj_get_int(o_value);
return mp_const_none; return mp_const_none;
......
...@@ -39,6 +39,7 @@ extern pyexec_mode_kind_t pyexec_mode_kind; ...@@ -39,6 +39,7 @@ extern pyexec_mode_kind_t pyexec_mode_kind;
int pyexec_raw_repl(void); int pyexec_raw_repl(void);
int pyexec_friendly_repl(void); int pyexec_friendly_repl(void);
int pyexec_file(const char *filename); int pyexec_file(const char *filename);
int pyexec_frozen_module(const char *name);
void pyexec_event_repl_init(void); void pyexec_event_repl_init(void);
int pyexec_event_repl_process_char(int c); int pyexec_event_repl_process_char(int c);
......
...@@ -22,11 +22,6 @@ ...@@ -22,11 +22,6 @@
#include "uart.h" #include "uart.h"
#include "pin.h" #include "pin.h"
#if MICROPY_MODULE_FROZEN
#include "py/compile.h"
#include "py/frozenmod.h"
#endif
extern uint32_t _heap_start; extern uint32_t _heap_start;
void flash_error(int n) { void flash_error(int n) {
...@@ -306,10 +301,7 @@ soft_reset: ...@@ -306,10 +301,7 @@ soft_reset:
#endif #endif
#if MICROPY_MODULE_FROZEN #if MICROPY_MODULE_FROZEN
{ pyexec_frozen_module("boot");
mp_lexer_t *lex = mp_find_frozen_module("boot", 4);
mp_parse_compile_execute(lex, MP_PARSE_FILE_INPUT, mp_globals_get(), mp_locals_get());
}
#else #else
if (!pyexec_file("/boot.py")) { if (!pyexec_file("/boot.py")) {
flash_error(4); flash_error(4);
...@@ -321,10 +313,7 @@ soft_reset: ...@@ -321,10 +313,7 @@ soft_reset:
// run main script // run main script
#if MICROPY_MODULE_FROZEN #if MICROPY_MODULE_FROZEN
{ pyexec_frozen_module("main");
mp_lexer_t *lex = mp_find_frozen_module("main", 4);
mp_parse_compile_execute(lex, MP_PARSE_FILE_INPUT, mp_globals_get(), mp_locals_get());
}
#else #else
{ {
vstr_t *vstr = vstr_new(); vstr_t *vstr = vstr_new();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment