From 8dbbbbc793554f920cf352b0e67da46abe3974cf Mon Sep 17 00:00:00 2001
From: Damien George
Date: Mon, 4 Aug 2014 10:05:16 +0100
Subject: Put call to qstr_init and mp_init_emergency_exc_buf in mp_init.

qstr_init is always called exactly before mp_init, so makes sense to
just have mp_init call it.  Similarly with
mp_init_emergency_exception_buf.  Doing this makes the ports simpler and
less error prone (ie they can no longer forget to call these).
---
 py/runtime.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'py')

diff --git a/py/runtime.c b/py/runtime.c
index a478bb62f..59e47c7ff 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -70,8 +70,13 @@ const mp_obj_module_t mp_module___main__ = {
 };
 
 void mp_init(void) {
+    qstr_init();
     mp_stack_ctrl_init();
 
+#if MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
+    mp_init_emergency_exception_buf();
+#endif
+
     // call port specific initialization if any
 #ifdef MICROPY_PORT_INIT_FUNC
     MICROPY_PORT_INIT_FUNC;
-- 
cgit v1.2.3