7f9d1d6ab9
Previous to this patch the printing mechanism was a bit of a tangled
mess. This patch attempts to consolidate printing into one interface.
All (non-debug) printing now uses the mp_print* family of functions,
mainly mp_printf. All these functions take an mp_print_t structure as
their first argument, and this structure defines the printing backend
through the "print_strn" function of said structure.
Printing from the uPy core can reach the platform-defined print code via
two paths: either through mp_sys_stdout_obj (defined pert port) in
conjunction with mp_stream_write; or through the mp_plat_print structure
which uses the MP_PLAT_PRINT_STRN macro to define how string are printed
on the platform. The former is only used when MICROPY_PY_IO is defined.
With this new scheme printing is generally more efficient (less layers
to go through, less arguments to pass), and, given an mp_print_t*
structure, one can call mp_print_str for efficiency instead of
mp_printf("%s", ...). Code size is also reduced by around 200 bytes on
Thumb2 archs.
92 lines
2.4 KiB
C
92 lines
2.4 KiB
C
#include <stdint.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <malloc.h>
|
|
|
|
#include "py/nlr.h"
|
|
#include "py/obj.h"
|
|
#include "py/compile.h"
|
|
#include "py/runtime0.h"
|
|
#include "py/runtime.h"
|
|
#include "py/stackctrl.h"
|
|
#include "py/gc.h"
|
|
#include "py/repl.h"
|
|
|
|
#include "tinytest.h"
|
|
#include "tinytest_macros.h"
|
|
|
|
void do_str(const char *src);
|
|
inline void do_str(const char *src) {
|
|
mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
|
|
if (lex == NULL) {
|
|
tt_abort_msg("Lexer initialization error");
|
|
}
|
|
|
|
nlr_buf_t nlr;
|
|
if (nlr_push(&nlr) == 0) {
|
|
qstr source_name = lex->source_name;
|
|
mp_parse_node_t pn = mp_parse(lex, MP_PARSE_FILE_INPUT);
|
|
mp_obj_t module_fun = mp_compile(pn, source_name, MP_EMIT_OPT_NONE, true);
|
|
mp_call_function_0(module_fun);
|
|
nlr_pop();
|
|
} else {
|
|
mp_obj_t exc = (mp_obj_t)nlr.ret_val;
|
|
if (mp_obj_is_subclass_fast(mp_obj_get_type(exc), &mp_type_SystemExit)) {
|
|
// Assume that sys.exit() is called to skip the test.
|
|
// TODO: That can be always true, we should set up convention to
|
|
// use specific exit code as skip indicator.
|
|
tinytest_set_test_skipped_();
|
|
return;
|
|
}
|
|
mp_obj_print_exception(&mp_extern_printf_wrapper, exc);
|
|
tt_abort_msg("Uncaught exception");
|
|
}
|
|
end:
|
|
;
|
|
}
|
|
|
|
#include "genhdr/tests.h"
|
|
|
|
int main() {
|
|
const char a[] = {"sim"};
|
|
mp_stack_set_limit(10240);
|
|
void *heap = malloc(256 * 1024);
|
|
gc_init(heap, (char*)heap + 256 * 1024);
|
|
mp_init();
|
|
int r = tinytest_main(1, (const char **) a, groups);
|
|
mp_deinit();
|
|
printf( "status: %i\n", r);
|
|
return r;
|
|
}
|
|
|
|
void gc_collect(void) {
|
|
gc_collect_start();
|
|
|
|
// get the registers and the sp
|
|
jmp_buf env;
|
|
setjmp(env);
|
|
volatile mp_uint_t dummy;
|
|
void *sp = (void*)&dummy;
|
|
|
|
// trace the stack, including the registers (since they live on the stack in this function)
|
|
gc_collect_root((void**)sp, ((uint32_t)MP_STATE_VM(stack_top) - (uint32_t)sp) / sizeof(uint32_t));
|
|
|
|
gc_collect_end();
|
|
}
|
|
|
|
mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
|
|
return NULL;
|
|
}
|
|
|
|
mp_import_stat_t mp_import_stat(const char *path) {
|
|
return MP_IMPORT_STAT_NO_EXIST;
|
|
}
|
|
|
|
mp_obj_t mp_builtin_open(uint n_args, const mp_obj_t *args, mp_map_t *kwargs) {
|
|
return mp_const_none;
|
|
}
|
|
MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
|
|
|
|
void nlr_jump_fail(void *val) {
|
|
}
|