github
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
10703 Commits
3 Branches
62 Tags
504 MiB
Tree: 8e8cfa6f53
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '8e8cfa6f53'
${ noResults }
micropython/py/py.mk

268 lines
6.9 KiB
Raw Normal View History

Factor and simplify Makefile's and mpconfig.
11 years ago
# where py object files go (they have a name prefix to prevent filename clashes)
Rework makefiles. Add proper dependency checking.
11 years ago
PY_BUILD = $(BUILD)/py
Factor and simplify Makefile's and mpconfig.
11 years ago
build directory can now be renamed The autogenerated header files have been moved about, and an extra include dir has been added, which means you can give a custom BUILD=newbuilddir option to make, and everything "just works" Also tidied up the way the different Makefiles build their include- directory flags
11 years ago
# where autogenerated header files go
build: Simplify build directory layout by putting all headers in genhdr. Any generated headers go in $(BUILD)/genhdr/, and are #included as 'genhdr/xxx.h'.
11 years ago
HEADER_BUILD = $(BUILD)/genhdr
Revamp qstrs: they now include length and hash. Can now have null bytes in strings. Can define ROM qstrs per port using qstrdefsport.h
11 years ago
build directory can now be renamed The autogenerated header files have been moved about, and an extra include dir has been added, which means you can give a custom BUILD=newbuilddir option to make, and everything "just works" Also tidied up the way the different Makefiles build their include- directory flags
11 years ago
# file containing qstr defs for the core Python bit
Revamp qstrs: they now include length and hash. Can now have null bytes in strings. Can define ROM qstrs per port using qstrdefsport.h
11 years ago
PY_QSTR_DEFS = $(PY_SRC)/qstrdefs.h
py/py.mk: Add makefile variable for qstr autogeneration control. - any architecture may explicitely build with qstring make QSTR_AUTOGEN_DISABLE=1 autogeneration disabled and provide its own list of qstrings by the standard mechanisms (qstrdefsport.h).
9 years ago
# If qstr autogeneration is not disabled we specify the output header
# for all collected qstrings.
ifneq ($(QSTR_AUTOGEN_DISABLE),1)
py: Add rules for automated extraction of qstrs from sources. - add template rule that converts a specified source file into a qstring file - add special rule for generating a central header that contains all extracted/autogenerated strings - defined by QSTR_DEFS_COLLECTED variable. Each platform appends a list of sources that may contain qstrings into a new build variable: SRC_QSTR. Any autogenerated prerequisities are should be appened to SRC_QSTR_AUTO_DEPS variable. - remove most qstrings from py/qstrdefs, keep only qstrings that contain special characters - these cannot be easily detected in the sources without additional annotations - remove most manual qstrdefs, use qstrdef autogen for: py, cc3200, stmhal, teensy, unix, windows, pic16bit: - remove all micropython generic qstrdefs except for the special strings that contain special characters (e.g. /,+,<,> etc.) - remove all port specific qstrdefs except for special strings - append sources for qstr generation in platform makefiles (SRC_QSTR)
9 years ago
QSTR_DEFS_COLLECTED = $(HEADER_BUILD)/qstrdefs.collected.h
py/py.mk: Add makefile variable for qstr autogeneration control. - any architecture may explicitely build with qstring make QSTR_AUTOGEN_DISABLE=1 autogeneration disabled and provide its own list of qstrings by the standard mechanisms (qstrdefsport.h).
9 years ago
endif
py: Add rules for automated extraction of qstrs from sources. - add template rule that converts a specified source file into a qstring file - add special rule for generating a central header that contains all extracted/autogenerated strings - defined by QSTR_DEFS_COLLECTED variable. Each platform appends a list of sources that may contain qstrings into a new build variable: SRC_QSTR. Any autogenerated prerequisities are should be appened to SRC_QSTR_AUTO_DEPS variable. - remove most qstrings from py/qstrdefs, keep only qstrings that contain special characters - these cannot be easily detected in the sources without additional annotations - remove most manual qstrdefs, use qstrdef autogen for: py, cc3200, stmhal, teensy, unix, windows, pic16bit: - remove all micropython generic qstrdefs except for the special strings that contain special characters (e.g. /,+,<,> etc.) - remove all port specific qstrdefs except for special strings - append sources for qstr generation in platform makefiles (SRC_QSTR)
9 years ago
py/mkrules.mk: Add QSTR_GLOBAL_REQUIREMENTS variable for qstr auto-gen.
5 years ago
# Any files listed by these variables will cause a full regeneration of qstrs
# DEPENDENCIES: included in qstr processing; REQUIREMENTS: not included
py/mkrules.mk: Regenerate all qstrs when config files change. A port can define QSTR_GLOBAL_DEPENDENCIES to add extra files.
7 years ago
QSTR_GLOBAL_DEPENDENCIES += $(PY_SRC)/mpconfig.h mpconfigport.h
py/mkrules.mk: Add QSTR_GLOBAL_REQUIREMENTS variable for qstr auto-gen.
5 years ago
QSTR_GLOBAL_REQUIREMENTS += $(HEADER_BUILD)/mpversion.h
py/mkrules.mk: Regenerate all qstrs when config files change. A port can define QSTR_GLOBAL_DEPENDENCIES to add extra files.
7 years ago
Makefile: Allow to override "super optimization" options used for some files. To help with debugging issue like #510 for example.
11 years ago
# some code is performance bottleneck and compiled with other optimization options
CSUPEROPT = -O3
py: Implement a module system for external, user C modules. This system makes it a lot easier to include external libraries as static, native modules in MicroPython. Simply pass USER_C_MODULES (like FROZEN_MPY_DIR) as a make parameter.
6 years ago
# External modules written in C.
ifneq ($(USER_C_MODULES),)
py/py.mk: Remove trailing spaces at end of line.
5 years ago
# pre-define USERMOD variables as expanded so that variables are immediate
py: Update and rework build system for including external C modules. How to use this feature is documented in docs/develop/cmodules.rst.
6 years ago
# expanded as they're added to them
py/py.mk: Remove trailing spaces at end of line.
5 years ago
SRC_USERMOD :=
py: Update and rework build system for including external C modules. How to use this feature is documented in docs/develop/cmodules.rst.
6 years ago
CFLAGS_USERMOD :=
LDFLAGS_USERMOD :=
$(foreach module, $(wildcard $(USER_C_MODULES)/*/micropython.mk), \
$(eval USERMOD_DIR = $(patsubst %/,%,$(dir $(module))))\
$(info Including User C Module from $(USERMOD_DIR))\
$(eval include $(module))\
)
SRC_MOD += $(patsubst $(USER_C_MODULES)/%.c,%.c,$(SRC_USERMOD))
CFLAGS_MOD += $(CFLAGS_USERMOD)
LDFLAGS_MOD += $(LDFLAGS_USERMOD)
py: Implement a module system for external, user C modules. This system makes it a lot easier to include external libraries as static, native modules in MicroPython. Simply pass USER_C_MODULES (like FROZEN_MPY_DIR) as a make parameter.
6 years ago
endif
Factor and simplify Makefile's and mpconfig.
11 years ago
# py object files
py/py.mk: Remove .. path component from list of extmod files. This just makes it a bit cleaner in the output of the build process: instead of "CC ../../py/../extmod/" there is now "CC ../../extmod/".
7 years ago
PY_CORE_O_BASENAME = $(addprefix py/,\
py: Put all global state together in state structures. This patch consolidates all global variables in py/ core into one place, in a global structure. Root pointers are all located together to make GC tracing easier and more efficient.
10 years ago
mpstate.o \
py/nlr: Factor out common NLR code to macro and generic funcs in nlr.c. Each NLR implementation (Thumb, x86, x64, xtensa, setjmp) duplicates a lot of the NLR code, specifically that dealing with pushing and popping the NLR pointer to maintain the linked-list of NLR buffers. This patch factors all of that code out of the specific implementations into generic functions in nlr.c, along with a helper macro in nlr.h. This eliminates duplicated code.
7 years ago
nlr.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
nlrx86.o \
nlrx64.o \
nlrthumb.o \
py: Add NLR support for xtensa CPU.
10 years ago
nlrxtensa.o \
nlr: Add implementation using setjmp/longjmp. Having an optimized asm implementation is good, but if we want portability, that's it.
11 years ago
nlrsetjmp.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
malloc.o \
Factor and simplify Makefile's and mpconfig, part 2.
11 years ago
gc.o \
py: Introduce a Python stack for scoped allocation. This patch introduces the MICROPY_ENABLE_PYSTACK option (disabled by default) which enables a "Python stack" that allows to allocate and free memory in a scoped, or Last-In-First-Out (LIFO) way, similar to alloca(). A new memory allocation API is introduced along with this Py-stack. It includes both "local" and "nonlocal" LIFO allocation. Local allocation is intended to be equivalent to using alloca(), whereby the same function must free the memory. Nonlocal allocation is where another function may free the memory, so long as it's still LIFO. Follow-up patches will convert all uses of alloca() and VLA to the new scoped allocation API. The old behaviour (using alloca()) will still be available, but when MICROPY_ENABLE_PYSTACK is enabled then alloca() is no longer required or used. The benefits of enabling this option are (or will be once subsequent patches are made to convert alloca()/VLA): - Toolchains without alloca() can use this feature to obtain correct and efficient scoped memory allocation (compared to using the heap instead of alloca(), which is slower). - Even if alloca() is available, enabling the Py-stack gives slightly more efficient use of stack space when calling nested Python functions, due to the way that compilers implement alloca(). - Enabling the Py-stack with the stackless mode allows for even more efficient stack usage, as well as retaining high performance (because the heap is no longer used to build and destroy stackless code states). - With Py-stack and stackless enabled, Python-calling-Python is no longer recursive in the C mp_execute_bytecode function. The micropython.pystack_use() function is included to measure usage of the Python stack.
7 years ago
pystack.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
qstr.o \
vstr.o \
py: Overhaul and simplify printf/pfenv mechanism. 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.
10 years ago
mpprint.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
unicode.o \
Add arbitrary precision integer support. Some functionality is still missing (eg and, or, bit shift), and some things are buggy (eg subtract).
11 years ago
mpz.o \
py: Factor out persistent-code reader into separate files. Implementations of persistent-code reader are provided for POSIX systems and systems using FatFS. Macros to use these are MICROPY_READER_POSIX and MICROPY_READER_FATFS respectively. If an alternative implementation is needed then a port can define the function mp_reader_new_file.
8 years ago
reader.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
lexer.o \
parse.o \
scope.o \
compile.o \
emitcommon.o \
emitbc.o \
py: Factor out common code from assemblers into asmbase.[ch]. All assemblers should "derive" from mp_asm_base_t.
8 years ago
asmbase.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
asmx64.o \
emitnx64.o \
py: Add support for emitting native x86 machine code.
10 years ago
asmx86.o \
emitnx86.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
asmthumb.o \
emitnthumb.o \
emitinlinethumb.o \
Basic native ARM emitter
10 years ago
asmarm.o \
emitnarm.o \
py: Integrate Xtensa assembler into native emitter. The config option MICROPY_EMIT_XTENSA can now be enabled to target the Xtensa architecture with @micropython.native and @micropython.viper decorators.
8 years ago
asmxtensa.o \
emitnxtensa.o \
py: Add inline Xtensa assembler. This patch adds the MICROPY_EMIT_INLINE_XTENSA option, which, when enabled, allows the @micropython.asm_xtensa decorator to be used. The following opcodes are currently supported (ax is a register, a0-a15): ret_n() callx0(ax) j(label) jx(ax) beqz(ax, label) bnez(ax, label) mov(ax, ay) movi(ax, imm) # imm can be full 32-bit, uses l32r if needed and_(ax, ay, az) or_(ax, ay, az) xor(ax, ay, az) add(ax, ay, az) sub(ax, ay, az) mull(ax, ay, az) l8ui(ax, ay, imm) l16ui(ax, ay, imm) l32i(ax, ay, imm) s8i(ax, ay, imm) s16i(ax, ay, imm) s32i(ax, ay, imm) l16si(ax, ay, imm) addi(ax, ay, imm) ball(ax, ay, label) bany(ax, ay, label) bbc(ax, ay, label) bbs(ax, ay, label) beq(ax, ay, label) bge(ax, ay, label) bgeu(ax, ay, label) blt(ax, ay, label) bnall(ax, ay, label) bne(ax, ay, label) bnone(ax, ay, label) Upon entry to the assembly function the registers a0, a12, a13, a14 are pushed to the stack and the stack pointer (a1) decreased by 16. Upon exit, these registers and the stack pointer are restored, and ret.n is executed to return to the caller (caller address is in a0). Note that the ABI for the Xtensa emitters is non-windowing.
8 years ago
emitinlinextensa.o \
py: Add new Xtensa-Windowed arch for native emitter. Enabled via the configuration MICROPY_EMIT_XTENSAWIN.
5 years ago
emitnxtensawin.o \
Rename formatfloat file; remove MICROPY_ENABLE_FLOAT from mpconfigport.h. MICROPY_ENABLE_FLOAT is automatically set in mpconfig.h if MICROPY_FLOAT_IMPL is set to a non-zero value.
11 years ago
formatfloat.o \
py: Implement bit-shift and not operations for mpz. Implement not, shl and shr in mpz library. Add function to create mpzs on the stack, used for memory efficiency when rhs is a small int. Factor out code to parse base-prefix of number into a dedicated function.
11 years ago
parsenumbase.o \
py: Put number parsing code together in parsenum.c.
11 years ago
parsenum.o \
py: Factor out code from runtime.c to emitglue.c.
11 years ago
emitglue.o \
py: Factor persistent code load/save funcs into persistentcode.[ch].
8 years ago
persistentcode.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
runtime.o \
py: Move call_function_*_protected() functions to py/ for reuse. They almost certainly needed by any C code which calls Python callbacks.
9 years ago
runtime_utils.o \
py: Add micropython.schedule() function and associated runtime code.
8 years ago
scheduler.o \
py: Move native glue code from runtime.c to new file nativeglue.c. This way, the native glue code is only compiled if native code is enabled (which makes complete sense; thanks to Paul Sokolovsky for the idea). Should fix issue #834.
10 years ago
nativeglue.o \
py/ringbuf: Add helpers for put16/get16.
5 years ago
ringbuf.o \
py: Add portable framework to query/check C stack usage. Such mechanism is important to get stable Python functioning, because Python function calling is handled with C stack. The idea is to sprinkle STACK_CHECK() calls in places where there can be C recursion. TODO: Add more STACK_CHECK()'s.
11 years ago
stackctrl.o \
py: Add arg checking helper functions. These are to assist in writing native C functions that take positional and keyword arguments. mp_arg_check_num is for just checking the number of arguments is correct. mp_arg_parse_all is for parsing positional and keyword arguments with default values.
11 years ago
argcheck.o \
py: Add basic framework for issuing compile/runtime warnings.
10 years ago
warning.o \
py: Integrate sys.settrace feature into the VM and runtime. This commit adds support for sys.settrace, allowing to install Python handlers to trace execution of Python code. The interface follows CPython as closely as possible. The feature is disabled by default and can be enabled via MICROPY_PY_SYS_SETTRACE.
5 years ago
profile.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
map.o \
obj.o \
Add skeleton implementation of array.array and bytearray. So far, only storage, initialization, repr() and buffer protocol is implemented - alredy suitable for passing binary data around.
11 years ago
objarray.o \
py: Add attrtuple object, for space-efficient tuples with attr access. If you need the functionality of a namedtuple but will only make 1 or a few instances, then use an attrtuple instead.
10 years ago
objattrtuple.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
objbool.o \
objboundmeth.o \
objcell.o \
objclosure.o \
objcomplex.o \
py/objdeque: Implement ucollections.deque type with fixed size. So far, implements just append() and popleft() methods, required for a normal queue. Constructor doesn't accept an arbitarry sequence to initialize from (am empty deque is always created), so an empty tuple must be passed as such. Only fixed-size deques are supported, so 2nd argument (size) is required. There's also an extension to CPython - if True is passed as 3rd argument, append(), instead of silently overwriting the oldest item on queue overflow, will throw IndexError. This behavior is desired in many cases, where queues should store information reliably, instead of silently losing some items.
7 years ago
objdeque.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
objdict.o \
added enumerate()
11 years ago
objenumerate.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
objexcept.o \
added filter()
11 years ago
objfilter.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
objfloat.o \
objfun.o \
objgenerator.o \
py: Implement iterator support for object that has __getitem__. Addresses Issue #203.
11 years ago
objgetitemiter.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
objint.o \
Add long int implementation using C long long type, enable for unix port.
11 years ago
objint_longlong.o \
Add arbitrary precision integer support. Some functionality is still missing (eg and, or, bit shift), and some things are buggy (eg subtract).
11 years ago
objint_mpz.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
objlist.o \
Added map
11 years ago
objmap.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
objmodule.o \
py: Add 'object' object.
11 years ago
objobject.o \
py/objpolyiter: Implement instance-polymorphic iterator type. This allows to have single itertaor type for various internal iterator types (save rodata space by not having repeating almost-empty type structures). It works by looking "iternext" method stored in particular object instance (should be first object field after "base").
9 years ago
objpolyiter.o \
py: Add property object, with basic functionality. Enabled by MICROPY_ENABLE_PROPERTY.
11 years ago
objproperty.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
objnone.o \
Add basic collections.namedtuple implementation.
11 years ago
objnamedtuple.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
objrange.o \
py: Implement builtin reversed() function. reversed function now implemented, and works for tuple, list, str, bytes and user objects with __len__ and __getitem__. Renamed mp_builtin_len to mp_obj_len to make it publically available (eg for reversed).
10 years ago
objreversed.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
objset.o \
objsingleton: New home for Ellipsis and NotImplemented. Having NotImplemented as MP_OBJ_SENTINEL turned out to be problematic (it needs to be checked for in a lot of places, otherwise it'll crash as would pass MP_OBJ_IS_OBJ()), so made a proper singleton value like Ellipsis, both of them sharing the same type.
10 years ago
objsingleton.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
objslice.o \
objstr.o \
py: Prune unneeded code from objstrunicode, reuse code in objstr.
11 years ago
objstrunicode.o \
modio: Implement io.StringIO class.
11 years ago
objstringio.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
objtuple.o \
objtype.o \
Revamp qstrs: they now include length and hash. Can now have null bytes in strings. Can define ROM qstrs per port using qstrdefsport.h
11 years ago
objzip.o \
py: Factor out impl of special methods for builtin types into opmethods.c
11 years ago
opmethods.o \
sequence.c: Start to refactor sequence operations for reuse among types.
11 years ago
sequence.o \
Add generic implementations of Python read()/write methods for streams. These can be used for any object which implements stream protocol (mp_stream_p_t).
11 years ago
stream.o \
ffi: Implement ffivar.get()/set() methods. Done by introducing another factored out helper API in binary.c. This API can be reused also by array and struct modules.
11 years ago
binary.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
builtinimport.o \
py: Implement builtin exec.
11 years ago
builtinevex.o \
py: Add builtin help function to core, with default help msg. This builtin is configured using MICROPY_PY_BUILTINS_HELP, and is disabled by default.
8 years ago
builtinhelp.o \
Proper support for registering builtin modules in ROM. Comes with some refactoring of code and renaming of files. All modules are now named mod*.[ch].
11 years ago
modarray.o \
py: Allow builtins to be overridden. This patch adds a configuration option (MICROPY_CAN_OVERRIDE_BUILTINS) which, when enabled, allows to override all names within the builtins module. A builtins override dict is created the first time the user assigns to a name in the builtins model, and then that dict is searched first on subsequent lookups. Note that this implementation doesn't allow deleting of names. This patch also does some refactoring of builtins code, creating the modbuiltins.c file. Addresses issue #959.
10 years ago
modbuiltins.o \
Proper support for registering builtin modules in ROM. Comes with some refactoring of code and renaming of files. All modules are now named mod*.[ch].
11 years ago
modcollections.o \
modgc: Add new module for GC-related functionality.
11 years ago
modgc.o \
py: Add "io" module. So far just includes "open" function, which should be supplied by a port. TODO: Make the module #ifdef'ed.
11 years ago
modio.o \
Proper support for registering builtin modules in ROM. Comes with some refactoring of code and renaming of files. All modules are now named mod*.[ch].
11 years ago
modmath.o \
py: Add cmath module, for complex math. Disabled by default. Not all functions implemented. Not enabled on pyboard.
11 years ago
modcmath.o \
Proper support for registering builtin modules in ROM. Comes with some refactoring of code and renaming of files. All modules are now named mod*.[ch].
11 years ago
modmicropython.o \
py: Start implementing "struct" module. Only calcsize() and unpack() functions provided so far, for little-endian byte order. Format strings don't support repition spec (like "2b3i"). Unfortunately, dealing with all the various binary type sizes and alignments will lead to quite a bloated "binary" helper functions - if optimizing for speed. Need to think if using dynamic parametrized algos makes more sense.
11 years ago
modstruct.o \
py, unix: Convert sys module to static representation.
11 years ago
modsys.o \
py: Add uerrno module, with errno constants and dict.
9 years ago
moduerrno.o \
py: Add basic _thread module, with ability to start a new thread.
9 years ago
modthread.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
vm.o \
py: Use variable length encoded uints in more places in bytecode. Code-info size, block name, source name, n_state and n_exc_stack now use variable length encoded uints. This saves 7-9 bytes per bytecode function for most functions.
10 years ago
bc.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
showbc.o \
repl.o \
py: This time, real proper overflow checking of small int power. Previous overflow test was inadequate.
11 years ago
smallint.o \
py: Implement very simple frozen modules support. Only modules (not packages) supported now. Source modules can be converted to frozen module structures using tools/make-frozen.py script.
10 years ago
frozenmod.o \
py/py.mk: Remove .. path component from list of extmod files. This just makes it a bit cleaner in the output of the build process: instead of "CC ../../py/../extmod/" there is now "CC ../../extmod/".
7 years ago
)
py/py.mk: Split list of uPy sources into core and extmod files. If a port only needs the core files then it can now use the $(PY_CORE_O) variable instead of $(PY_O). $(PY_EXTMOD_O) contains the list of extmod files (including some files from lib/). $(PY_O) retains its original definition as the list of all object file (including those for frozen code) and is a convenience variable for ports that want everything.
7 years ago
PY_EXTMOD_O_BASENAME = \
py/py.mk: Remove .. path component from list of extmod files. This just makes it a bit cleaner in the output of the build process: instead of "CC ../../py/../extmod/" there is now "CC ../../extmod/".
7 years ago
extmod/moductypes.o \
extmod/modujson.o \
extmod/modure.o \
extmod/moduzlib.o \
extmod/moduheapq.o \
extmod/modutimeq.o \
extmod/moduhashlib.o \
extmod/moducryptolib: Add ucryptolib module with crypto functions. The API follows guidelines of https://www.python.org/dev/peps/pep-0272/, but is optimized for code size, with the idea that full PEP 0272 compatibility can be added with a simple Python wrapper mode. The naming of the module follows (u)hashlib pattern. At the bare minimum, this module is expected to provide: * AES128, ECB (i.e. "null") mode, encrypt only Implementation in this commit is based on axTLS routines, and implements following: * AES 128 and 256 * ECB and CBC modes * encrypt and decrypt
7 years ago
extmod/moducryptolib.o \
py/py.mk: Remove .. path component from list of extmod files. This just makes it a bit cleaner in the output of the build process: instead of "CC ../../py/../extmod/" there is now "CC ../../extmod/".
7 years ago
extmod/modubinascii.o \
extmod/virtpin.o \
extmod/machine_mem.o \
extmod/machine_pinbase.o \
extmod/machine_signal.o \
extmod/machine_pulse.o \
extmod/machine_i2c.o \
extmod/machine_spi.o \
extmod/modbluetooth: Add low-level Python BLE API.
5 years ago
extmod/modbluetooth.o \
py/py.mk: Remove .. path component from list of extmod files. This just makes it a bit cleaner in the output of the build process: instead of "CC ../../py/../extmod/" there is now "CC ../../extmod/".
7 years ago
extmod/modussl_axtls.o \
extmod/modussl_mbedtls.o \
extmod/modurandom.o \
extmod/moduselect.o \
extmod/moduwebsocket: Refactor `websocket` to `uwebsocket`. As mentioned in #4450, `websocket` was experimental with a single intended user, `webrepl`. Therefore, we'll make this change without a weak link `websocket` -> `uwebsocket`.
6 years ago
extmod/moduwebsocket.o \
py/py.mk: Remove .. path component from list of extmod files. This just makes it a bit cleaner in the output of the build process: instead of "CC ../../py/../extmod/" there is now "CC ../../extmod/".
7 years ago
extmod/modwebrepl.o \
extmod/modframebuf.o \
extmod/vfs.o \
extmod/vfs_reader.o \
extmod: Add VfsPosix filesystem component. This VFS component allows to mount a host POSIX filesystem within the uPy VFS sub-system. All traditional POSIX file access then goes through the VFS, allowing to sandbox a uPy process to a certain sub-dir of the host system, as well as mount other filesystem types alongside the host filesystem.
7 years ago
extmod/vfs_posix.o \
extmod/vfs_posix_file.o \
py/py.mk: Remove .. path component from list of extmod files. This just makes it a bit cleaner in the output of the build process: instead of "CC ../../py/../extmod/" there is now "CC ../../extmod/".
7 years ago
extmod/vfs_fat.o \
extmod/vfs_fat_diskio.o \
extmod/vfs_fat_file.o \
extmod/utime_mphal.o \
extmod/uos_dupterm.o \
lib/embed/abort_.o \
lib/utils/printf.o \
Factor and simplify Makefile's and mpconfig.
11 years ago
# prepend the build destination prefix to the py object files
py/py.mk: Remove .. path component from list of extmod files. This just makes it a bit cleaner in the output of the build process: instead of "CC ../../py/../extmod/" there is now "CC ../../extmod/".
7 years ago
PY_CORE_O = $(addprefix $(BUILD)/, $(PY_CORE_O_BASENAME))
PY_EXTMOD_O = $(addprefix $(BUILD)/, $(PY_EXTMOD_O_BASENAME))
py/py.mk: Split list of uPy sources into core and extmod files. If a port only needs the core files then it can now use the $(PY_CORE_O) variable instead of $(PY_O). $(PY_EXTMOD_O) contains the list of extmod files (including some files from lib/). $(PY_O) retains its original definition as the list of all object file (including those for frozen code) and is a convenience variable for ports that want everything.
7 years ago
# this is a convenience variable for ports that want core, extmod and frozen code
PY_O = $(PY_CORE_O) $(PY_EXTMOD_O)
Factor and simplify Makefile's and mpconfig.
11 years ago
py: Move frozen bytecode Makefile rules from ports to common mk files. Now, to use frozen bytecode all a port needs to do is define FROZEN_MPY_DIR to the directory containing the .py files to freeze, and define MICROPY_MODULE_FROZEN_MPY and MICROPY_QSTR_EXTRA_POOL.
8 years ago
# object file for frozen files
py/py.mk: Automatically add frozen.c to source list if FROZEN_DIR is defined. Now frozen modules generation handled fully by py.mk and available for reuse by any port.
8 years ago
ifneq ($(FROZEN_DIR),)
PY_O += $(BUILD)/$(BUILD)/frozen.o
endif
py: Move frozen bytecode Makefile rules from ports to common mk files. Now, to use frozen bytecode all a port needs to do is define FROZEN_MPY_DIR to the directory containing the .py files to freeze, and define MICROPY_MODULE_FROZEN_MPY and MICROPY_QSTR_EXTRA_POOL.
8 years ago
# object file for frozen bytecode (frozen .mpy files)
ifneq ($(FROZEN_MPY_DIR),)
PY_O += $(BUILD)/$(BUILD)/frozen_mpy.o
endif
py: Add rules for automated extraction of qstrs from sources. - add template rule that converts a specified source file into a qstring file - add special rule for generating a central header that contains all extracted/autogenerated strings - defined by QSTR_DEFS_COLLECTED variable. Each platform appends a list of sources that may contain qstrings into a new build variable: SRC_QSTR. Any autogenerated prerequisities are should be appened to SRC_QSTR_AUTO_DEPS variable. - remove most qstrings from py/qstrdefs, keep only qstrings that contain special characters - these cannot be easily detected in the sources without additional annotations - remove most manual qstrdefs, use qstrdef autogen for: py, cc3200, stmhal, teensy, unix, windows, pic16bit: - remove all micropython generic qstrdefs except for the special strings that contain special characters (e.g. /,+,<,> etc.) - remove all port specific qstrdefs except for special strings - append sources for qstr generation in platform makefiles (SRC_QSTR)
9 years ago
# Sources that may contain qstrings
py: Refactor how native emitter code is compiled with a file per arch. Instead of emitnative.c having configuration code for each supported architecture, and then compiling this file multiple times with different macros defined, this patch adds a file per architecture with the necessary code to configure the native emitter. These files then #include the emitnative.c file. This simplifies emitnative.c (which is already very large), and simplifies the build system because emitnative.c no longer needs special handling for compilation and qstr extraction.
7 years ago
SRC_QSTR_IGNORE = py/nlr%
py: Implement a module system for external, user C modules. This system makes it a lot easier to include external libraries as static, native modules in MicroPython. Simply pass USER_C_MODULES (like FROZEN_MPY_DIR) as a make parameter.
6 years ago
SRC_QSTR += $(SRC_MOD) $(filter-out $(SRC_QSTR_IGNORE),$(PY_CORE_O_BASENAME:.o=.c)) $(PY_EXTMOD_O_BASENAME:.o=.c)
py: Add rules for automated extraction of qstrs from sources. - add template rule that converts a specified source file into a qstring file - add special rule for generating a central header that contains all extracted/autogenerated strings - defined by QSTR_DEFS_COLLECTED variable. Each platform appends a list of sources that may contain qstrings into a new build variable: SRC_QSTR. Any autogenerated prerequisities are should be appened to SRC_QSTR_AUTO_DEPS variable. - remove most qstrings from py/qstrdefs, keep only qstrings that contain special characters - these cannot be easily detected in the sources without additional annotations - remove most manual qstrdefs, use qstrdef autogen for: py, cc3200, stmhal, teensy, unix, windows, pic16bit: - remove all micropython generic qstrdefs except for the special strings that contain special characters (e.g. /,+,<,> etc.) - remove all port specific qstrdefs except for special strings - append sources for qstr generation in platform makefiles (SRC_QSTR)
9 years ago
Add the git version to the banner
11 years ago
# Anything that depends on FORCE will be considered out-of-date
FORCE:
.PHONY: FORCE
py: Replace py-version.sh with makeversionhdr.py, written in Python. Also rename py-version.h to mpversion.h for consistency with mpconfig.h.
10 years ago
$(HEADER_BUILD)/mpversion.h: FORCE | $(HEADER_BUILD)
$(Q)$(PYTHON) $(PY_SRC)/makeversionhdr.py $@
Add the git version to the banner
11 years ago
py: Rebuild port if mpconfigport.mk changed (if any). mpconfigport.mk contains configuration options which affect the way MicroPython is linked. In this regard, it's "stronger" configuration dependency than even mpconfigport.h, so if we rebuild everything on mpconfigport.h change, we certianly should of that on mpconfigport.mk change too.
10 years ago
# mpconfigport.mk is optional, but changes to it may drastically change
# overall config, so they need to be caught
MPCONFIGPORT_MK = $(wildcard mpconfigport.mk)
Revamp qstrs: they now include length and hash. Can now have null bytes in strings. Can define ROM qstrs per port using qstrdefsport.h
11 years ago
# qstr data
build: Simplify build directory layout by putting all headers in genhdr. Any generated headers go in $(BUILD)/genhdr/, and are #included as 'genhdr/xxx.h'.
11 years ago
# Adding an order only dependency on $(HEADER_BUILD) causes $(HEADER_BUILD) to get
Rework makefiles. Add proper dependency checking.
11 years ago
# created before we run the script to generate the .h
py: Wrap qstr defs in quotes to protect from C preprocessor. This patch converts Q(abc) to "Q(abc)" to protect the abc from the C preprocessor, then converts back after the preprocessor is finished. So now we can safely put includes in mpconfig(port).h, and also preprocess qstrdefsport.h (latter is now done also in this patch). Addresses issue #1252.
10 years ago
# Note: we need to protect the qstr names from the preprocessor, so we wrap
# the lines in "" and then unwrap after the preprocessor is finished.
docs/develop/qstr.rst: Add documentation for string interning.
5 years ago
# See more information about this process in docs/develop/qstr.rst.
py: Add rules for automated extraction of qstrs from sources. - add template rule that converts a specified source file into a qstring file - add special rule for generating a central header that contains all extracted/autogenerated strings - defined by QSTR_DEFS_COLLECTED variable. Each platform appends a list of sources that may contain qstrings into a new build variable: SRC_QSTR. Any autogenerated prerequisities are should be appened to SRC_QSTR_AUTO_DEPS variable. - remove most qstrings from py/qstrdefs, keep only qstrings that contain special characters - these cannot be easily detected in the sources without additional annotations - remove most manual qstrdefs, use qstrdef autogen for: py, cc3200, stmhal, teensy, unix, windows, pic16bit: - remove all micropython generic qstrdefs except for the special strings that contain special characters (e.g. /,+,<,> etc.) - remove all port specific qstrdefs except for special strings - append sources for qstr generation in platform makefiles (SRC_QSTR)
9 years ago
$(HEADER_BUILD)/qstrdefs.generated.h: $(PY_QSTR_DEFS) $(QSTR_DEFS) $(QSTR_DEFS_COLLECTED) $(PY_SRC)/makeqstrdata.py mpconfigport.h $(MPCONFIGPORT_MK) $(PY_SRC)/mpconfig.h | $(HEADER_BUILD)
py: Wrap qstr defs in quotes to protect from C preprocessor. This patch converts Q(abc) to "Q(abc)" to protect the abc from the C preprocessor, then converts back after the preprocessor is finished. So now we can safely put includes in mpconfig(port).h, and also preprocess qstrdefsport.h (latter is now done also in this patch). Addresses issue #1252.
10 years ago
$(ECHO) "GEN $@"
py: Update makefiles to use $(CAT) variable instead of hard coded "cat". The variable $(CAT) is initialised with the "cat" value in mkenv.mk like for the other command line tools (rm, echo, cp, mkdir etc). With this, for example, Windows users can specify the path of cat.exe.
6 years ago
$(Q)$(CAT) $(PY_QSTR_DEFS) $(QSTR_DEFS) $(QSTR_DEFS_COLLECTED) | $(SED) 's/^Q(.*)/"&"/' | $(CPP) $(CFLAGS) - | $(SED) 's/^\"\(Q(.*)\)\"/\1/' > $(HEADER_BUILD)/qstrdefs.preprocessed.h
py: Wrap qstr defs in quotes to protect from C preprocessor. This patch converts Q(abc) to "Q(abc)" to protect the abc from the C preprocessor, then converts back after the preprocessor is finished. So now we can safely put includes in mpconfig(port).h, and also preprocess qstrdefsport.h (latter is now done also in this patch). Addresses issue #1252.
10 years ago
$(Q)$(PYTHON) $(PY_SRC)/makeqstrdata.py $(HEADER_BUILD)/qstrdefs.preprocessed.h > $@
Revamp qstrs: they now include length and hash. Can now have null bytes in strings. Can define ROM qstrs per port using qstrdefsport.h
11 years ago
py: Allow registration of modules at their definition. During make, makemoduledefs.py parses the current builds c files for MP_REGISTER_MODULE(module_name, obj_module, enabled_define) These are used to generate a header with the required entries for "mp_rom_map_elem_t mp_builtin_module_table[]" in py/objmodule.c
6 years ago
# build a list of registered modules for py/objmodule.c.
$(HEADER_BUILD)/moduledefs.h: $(SRC_QSTR) $(QSTR_GLOBAL_DEPENDENCIES) | $(HEADER_BUILD)/mpversion.h
@$(ECHO) "GEN $@"
$(Q)$(PYTHON) $(PY_SRC)/makemoduledefs.py --vpath="., $(TOP), $(USER_C_MODULES)" $(SRC_QSTR) > $@
py: Update and rework build system for including external C modules. How to use this feature is documented in docs/develop/cmodules.rst.
6 years ago
SRC_QSTR += $(HEADER_BUILD)/moduledefs.h
py/py.mk: Force nlr files to be compiled with -Os.
8 years ago
# Force nlr code to always be compiled with space-saving optimisation so
# that the function preludes are of a minimal and predictable form.
$(PY_BUILD)/nlr%.o: CFLAGS += -Os
Factor and simplify Makefile's and mpconfig, part 2.
11 years ago
# optimising gc for speed; 5ms down to 4ms on pybv2
Makefile: Allow to override "super optimization" options used for some files. To help with debugging issue like #510 for example.
11 years ago
$(PY_BUILD)/gc.o: CFLAGS += $(CSUPEROPT)
Factor and simplify Makefile's and mpconfig, part 2.
11 years ago
Factor and simplify Makefile's and mpconfig.
11 years ago
# optimising vm for speed, adds only a small amount to code size but makes a huge difference to speed (20% faster)
Makefile: Allow to override "super optimization" options used for some files. To help with debugging issue like #510 for example.
11 years ago
$(PY_BUILD)/vm.o: CFLAGS += $(CSUPEROPT)
py: Add note about -fno-crossjumping when compiling vm.c.
10 years ago
# Optimizing vm.o for modern deeply pipelined CPUs with branch predictors
# may require disabling tail jump optimization. This will make sure that
# each opcode has its own dispatching jump which will improve branch
# branch predictor efficiency.
py/py.mk: Fix broken Gmane URL.
6 years ago
# https://marc.info/?l=lua-l&m=129778596120851
py: Add note about -fno-crossjumping when compiling vm.c.
10 years ago
# http://hg.python.org/cpython/file/b127046831e2/Python/ceval.c#l828
# http://www.emulators.com/docs/nx25_nostradamus.htm
#-fno-crossjumping
extmod: Factor out makefile rules from py.mk to new extmod.mk file. To logically separate extmod related rules out, and prevent py.mk from growing too large.
6 years ago
# Include rules for extmod related code
include $(TOP)/extmod/extmod.mk