aboutsummaryrefslogtreecommitdiff
path: root/qemu-arm
diff options
context:
space:
mode:
Diffstat (limited to 'qemu-arm')
-rw-r--r--qemu-arm/Makefile115
-rw-r--r--qemu-arm/README.md23
-rw-r--r--qemu-arm/main.c62
-rw-r--r--qemu-arm/modmachine.c47
-rw-r--r--qemu-arm/moduos.c53
-rw-r--r--qemu-arm/mpconfigport.h70
-rw-r--r--qemu-arm/mphalport.h2
-rw-r--r--qemu-arm/qstrdefsport.h1
-rw-r--r--qemu-arm/test_main.c94
9 files changed, 0 insertions, 467 deletions
diff --git a/qemu-arm/Makefile b/qemu-arm/Makefile
deleted file mode 100644
index 71403cb5e..000000000
--- a/qemu-arm/Makefile
+++ /dev/null
@@ -1,115 +0,0 @@
-include ../py/mkenv.mk
--include mpconfigport.mk
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
-
-# include py core make definitions
-include $(TOP)/py/py.mk
-
-CROSS_COMPILE = arm-none-eabi-
-
-INC += -I.
-INC += -I$(TOP)
-INC += -I$(BUILD)
-INC += -I$(TOP)/tools/tinytest/
-
-CFLAGS_CORTEX_M3 = -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
-CFLAGS = $(INC) -Wall -Wpointer-arith -Werror -std=gnu99 $(CFLAGS_CORTEX_M3) $(COPT) \
- -ffunction-sections -fdata-sections
-
-#Debugging/Optimization
-ifeq ($(DEBUG), 1)
-CFLAGS += -g -DPENDSV_DEBUG
-COPT = -O0
-else
-COPT += -Os -DNDEBUG
-endif
-
-## With CoudeSourcery it's actually a little different, you just need `-T generic-m-hosted.ld`.
-## Although for some reason `$(LD)` will not find that linker script, it works with `$(CC)`.
-## It turns out that this is specific to CoudeSourcery, and ARM version of GCC ships something
-## else instead and according to the following files, this is what we need to pass to `$(CC).
-## - gcc-arm-none-eabi-4_8-2014q1/share/gcc-arm-none-eabi/samples/src/makefile.conf
-## - gcc-arm-none-eabi-4_8-2014q1/share/gcc-arm-none-eabi/samples/src/qemu/Makefile
-LDFLAGS= --specs=nano.specs --specs=rdimon.specs -Wl,--gc-sections -Wl,-Map=$(@:.elf=.map)
-
-SRC_COMMON_C = \
- moduos.c \
- modmachine.c \
-
-SRC_RUN_C = \
- main.c \
-
-SRC_TEST_C = \
- test_main.c \
-
-LIB_SRC_C = $(addprefix lib/,\
- libm/math.c \
- libm/fmodf.c \
- libm/nearbyintf.c \
- libm/ef_sqrt.c \
- libm/kf_rem_pio2.c \
- libm/kf_sin.c \
- libm/kf_cos.c \
- libm/kf_tan.c \
- libm/ef_rem_pio2.c \
- libm/sf_sin.c \
- libm/sf_cos.c \
- libm/sf_tan.c \
- libm/sf_frexp.c \
- libm/sf_modf.c \
- libm/sf_ldexp.c \
- libm/asinfacosf.c \
- libm/atanf.c \
- libm/atan2f.c \
- utils/sys_stdio_mphal.c \
- )
-
-OBJ_COMMON =
-OBJ_COMMON += $(PY_O)
-OBJ_COMMON += $(addprefix $(BUILD)/, $(SRC_COMMON_C:.c=.o))
-OBJ_COMMON += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
-
-OBJ_RUN =
-OBJ_RUN += $(addprefix $(BUILD)/, $(SRC_RUN_C:.c=.o))
-
-OBJ_TEST =
-OBJ_TEST += $(addprefix $(BUILD)/, $(SRC_TEST_C:.c=.o))
-OBJ_TEST += $(BUILD)/tinytest.o
-
-# All object files, needed to get dependencies correct
-OBJ = $(OBJ_COMMON) $(OBJ_RUN) $(OBJ_TEST)
-
-# List of sources for qstr extraction
-SRC_QSTR += $(SRC_COMMON_C) $(SRC_RUN_C) $(LIB_SRC_C)
-
-all: run
-
-run: $(BUILD)/firmware.elf
- qemu-system-arm -machine integratorcp -cpu cortex-m3 -nographic -monitor null -serial null -semihosting -kernel $(BUILD)/firmware.elf
-
-test: $(BUILD)/firmware-test.elf
- qemu-system-arm -machine integratorcp -cpu cortex-m3 -nographic -monitor null -serial null -semihosting -kernel $(BUILD)/firmware-test.elf > $(BUILD)/console.out
- $(Q)tail -n2 $(BUILD)/console.out
- $(Q)tail -n1 $(BUILD)/console.out | grep -q "status: 0"
-
-.PHONY: $(BUILD)/genhdr/tests.h
-
-$(BUILD)/test_main.o: $(BUILD)/genhdr/tests.h
-$(BUILD)/genhdr/tests.h:
- $(Q)echo "Generating $@";(cd $(TOP)/tests; ../tools/tinytest-codegen.py) > $@
-
-$(BUILD)/tinytest.o:
- $(Q)$(CC) $(CFLAGS) -DNO_FORKING -o $@ -c $(TOP)/tools/tinytest/tinytest.c
-
-## `$(LD)` doesn't seem to like `--specs` for some reason, but we can just use `$(CC)` here.
-$(BUILD)/firmware.elf: $(OBJ_COMMON) $(OBJ_RUN)
- $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
- $(Q)$(SIZE) $@
-
-$(BUILD)/firmware-test.elf: $(OBJ_COMMON) $(OBJ_TEST)
- $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
- $(Q)$(SIZE) $@
-
-include $(TOP)/py/mkrules.mk
diff --git a/qemu-arm/README.md b/qemu-arm/README.md
deleted file mode 100644
index 0cf93c7d5..000000000
--- a/qemu-arm/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-This is experimental, community-supported port for Cortex-M emulation as
-provided by QEMU (http://qemu.org).
-
-The purposes of this port are to enable:
-
-1. Continuous integration
- - run tests against architecture-specific parts of code base
-2. Experimentation
- - simulation & prototyping of anything that has architecture-specific
- code
- - exploring instruction set in terms of optimising some part of
- MicroPython or a module
-3. Streamlined debugging
- - no need for JTAG or even an MCU chip itself
- - no need to use OpenOCD or anything else that might slow down the
- process in terms of plugging things together, pressing buttons, etc.
-
-This port will only work with with [GCC ARM Embedded](launchpad.net/gcc-arm-embedded)
-toolchain and not with CodeSourcery toolchain. You will need to modify
-`LDFLAGS` if you want to use CodeSourcery's version of `arm-none-eabi`.
-The difference is that CodeSourcery needs `-T generic-m-hosted.ld` while
-ARM's version requires `--specs=nano.specs --specs=rdimon.specs` to be
-passed to the linker.
diff --git a/qemu-arm/main.c b/qemu-arm/main.c
deleted file mode 100644
index d5fbcd84b..000000000
--- a/qemu-arm/main.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include <stdint.h>
-#include <stdlib.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 "py/mperrno.h"
-
-void do_str(const char *src, mp_parse_input_kind_t input_kind) {
- nlr_buf_t nlr;
- if (nlr_push(&nlr) == 0) {
- mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
- qstr source_name = lex->source_name;
- mp_parse_tree_t parse_tree = mp_parse(lex, input_kind);
- mp_obj_t module_fun = mp_compile(&parse_tree, source_name, MP_EMIT_OPT_NONE, true);
- mp_call_function_0(module_fun);
- nlr_pop();
- } else {
- // uncaught exception
- mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);
- }
-}
-
-int main(int argc, char **argv) {
- mp_stack_ctrl_init();
- mp_stack_set_limit(10240);
- void *heap = malloc(16 * 1024);
- gc_init(heap, (char*)heap + 16 * 1024);
- mp_init();
- do_str("print('hello world!')", MP_PARSE_SINGLE_INPUT);
- mp_deinit();
- return 0;
-}
-
-void gc_collect(void) {
-}
-
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
- mp_raise_OSError(MP_ENOENT);
-}
-
-mp_import_stat_t mp_import_stat(const char *path) {
- return MP_IMPORT_STAT_NO_EXIST;
-}
-
-mp_obj_t mp_builtin_open(size_t 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) {
- printf("uncaught NLR\n");
- exit(1);
-}
diff --git a/qemu-arm/modmachine.c b/qemu-arm/modmachine.c
deleted file mode 100644
index 0f66349a8..000000000
--- a/qemu-arm/modmachine.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017 Damien P. George
- *
- * 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 "extmod/machine_mem.h"
-#include "extmod/machine_pinbase.h"
-#include "extmod/machine_signal.h"
-
-STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
- { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_umachine) },
-
- { MP_ROM_QSTR(MP_QSTR_mem8), MP_ROM_PTR(&machine_mem8_obj) },
- { MP_ROM_QSTR(MP_QSTR_mem16), MP_ROM_PTR(&machine_mem16_obj) },
- { MP_ROM_QSTR(MP_QSTR_mem32), MP_ROM_PTR(&machine_mem32_obj) },
-
- { MP_ROM_QSTR(MP_QSTR_PinBase), MP_ROM_PTR(&machine_pinbase_type) },
- { MP_ROM_QSTR(MP_QSTR_Signal), MP_ROM_PTR(&machine_signal_type) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
-
-const mp_obj_module_t mp_module_machine = {
- .base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&machine_module_globals,
-};
diff --git a/qemu-arm/moduos.c b/qemu-arm/moduos.c
deleted file mode 100644
index a48b51db0..000000000
--- a/qemu-arm/moduos.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017 Damien P. George
- *
- * 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 "extmod/vfs.h"
-
-STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
- { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
-
- { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
- { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
- { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
- { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
- { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
- { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
- { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mp_vfs_rename_obj) },
- { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
- { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
- { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
-
- // MicroPython extensions
- { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
- { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
-
-const mp_obj_module_t mp_module_uos = {
- .base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&os_module_globals,
-};
diff --git a/qemu-arm/mpconfigport.h b/qemu-arm/mpconfigport.h
deleted file mode 100644
index a12165a92..000000000
--- a/qemu-arm/mpconfigport.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#include <stdint.h>
-
-// options to control how MicroPython is built
-
-#define MICROPY_ALLOC_PATH_MAX (512)
-#define MICROPY_EMIT_X64 (0)
-#define MICROPY_EMIT_THUMB (1)
-#define MICROPY_EMIT_INLINE_THUMB (1)
-#define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
-#define MICROPY_MEM_STATS (1)
-#define MICROPY_DEBUG_PRINTERS (0)
-#define MICROPY_ENABLE_GC (1)
-#define MICROPY_STACK_CHECK (1)
-#define MICROPY_HELPER_REPL (0)
-#define MICROPY_HELPER_LEXER_UNIX (0)
-#define MICROPY_ENABLE_SOURCE_LINE (1)
-#define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_MPZ)
-#define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_FLOAT)
-#define MICROPY_CAN_OVERRIDE_BUILTINS (1)
-#define MICROPY_PY_ALL_SPECIAL_METHODS (1)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
-#define MICROPY_PY_BUILTINS_FROZENSET (1)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
-#define MICROPY_PY_BUILTINS_POW3 (1)
-#define MICROPY_PY_IO (1)
-#define MICROPY_PY_SYS_EXIT (1)
-#define MICROPY_PY_SYS_MAXSIZE (1)
-#define MICROPY_PY_UERRNO (1)
-#define MICROPY_PY_UBINASCII (1)
-#define MICROPY_PY_URANDOM (1)
-#define MICROPY_PY_UCTYPES (1)
-#define MICROPY_PY_UZLIB (1)
-#define MICROPY_PY_UJSON (1)
-#define MICROPY_PY_URE (1)
-#define MICROPY_PY_UHEAPQ (1)
-#define MICROPY_PY_UHASHLIB (1)
-#define MICROPY_PY_MACHINE (1)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
-#define MICROPY_USE_INTERNAL_PRINTF (0)
-#define MICROPY_VFS (1)
-
-// type definitions for the specific machine
-
-#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
-
-#define MP_SSIZE_MAX (0x7fffffff)
-
-#define UINT_FMT "%lu"
-#define INT_FMT "%ld"
-
-typedef int32_t mp_int_t; // must be pointer size
-typedef uint32_t mp_uint_t; // must be pointer size
-typedef long mp_off_t;
-
-#include <unistd.h>
-#define MP_PLAT_PRINT_STRN(str, len) write(1, str, len)
-
-// extra built in names to add to the global namespace
-#define MICROPY_PORT_BUILTINS \
- { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
-
-// extra built-in modules to add to the list of known ones
-extern const struct _mp_obj_module_t mp_module_uos;
-
-#define MICROPY_PORT_BUILTIN_MODULES \
- { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
- { MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&mp_module_machine) }, \
-
-// We need to provide a declaration/definition of alloca()
-#include <alloca.h>
diff --git a/qemu-arm/mphalport.h b/qemu-arm/mphalport.h
deleted file mode 100644
index d996402ae..000000000
--- a/qemu-arm/mphalport.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define mp_hal_stdin_rx_chr() (0)
-#define mp_hal_stdout_tx_strn_cooked(s, l) write(1, (s), (l))
diff --git a/qemu-arm/qstrdefsport.h b/qemu-arm/qstrdefsport.h
deleted file mode 100644
index 3ba897069..000000000
--- a/qemu-arm/qstrdefsport.h
+++ /dev/null
@@ -1 +0,0 @@
-// qstrs specific to this port
diff --git a/qemu-arm/test_main.c b/qemu-arm/test_main.c
deleted file mode 100644
index 5c07d1607..000000000
--- a/qemu-arm/test_main.c
+++ /dev/null
@@ -1,94 +0,0 @@
-#include <stdint.h>
-#include <stdlib.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/mperrno.h"
-
-#include "tinytest.h"
-#include "tinytest_macros.h"
-
-#define HEAP_SIZE (128 * 1024)
-STATIC void *heap;
-
-void do_str(const char *src);
-inline void do_str(const char *src) {
- gc_init(heap, (char*)heap + HEAP_SIZE);
- mp_init();
-
- nlr_buf_t nlr;
- if (nlr_push(&nlr) == 0) {
- mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
- qstr source_name = lex->source_name;
- mp_parse_tree_t parse_tree = mp_parse(lex, MP_PARSE_FILE_INPUT);
- mp_obj_t module_fun = mp_compile(&parse_tree, source_name, MP_EMIT_OPT_NONE, false);
- 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_();
- goto end;
- }
- mp_obj_print_exception(&mp_plat_print, exc);
- tt_abort_msg("Uncaught exception");
- }
-end:
- mp_deinit();
-}
-
-#include "genhdr/tests.h"
-
-int main() {
- const char a[] = {"sim"};
- mp_stack_ctrl_init();
- mp_stack_set_limit(10240);
- heap = malloc(HEAP_SIZE);
- int r = tinytest_main(1, (const char **) a, groups);
- 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_THREAD(stack_top) - (uint32_t)sp) / sizeof(uint32_t));
-
- gc_collect_end();
-}
-
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
- mp_raise_OSError(MP_ENOENT);
-}
-
-mp_import_stat_t mp_import_stat(const char *path) {
- return MP_IMPORT_STAT_NO_EXIST;
-}
-
-mp_obj_t mp_builtin_open(size_t 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) {
- printf("uncaught NLR\n");
- exit(1);
-}