30ee7019ca
Fixes for stmhal USB mass storage, lwIP bindings and VFS regressions This release provides an important fix for the USB mass storage device in the stmhal port by implementing the SCSI SYNCHRONIZE_CACHE command, which is now require by some Operating Systems. There are also fixes for the lwIP bindings to improve non-blocking sockets and error codes. The VFS has some regressions fixed including the ability to statvfs the root. All changes are listed below. py core: - modbuiltins: add core-provided version of input() function - objstr: catch case of negative "maxsplit" arg to str.rsplit() - persistentcode: allow to compile with complex numbers disabled - objstr: allow to compile with obj-repr D, and unicode disabled - modsys: allow to compile with obj-repr D and PY_ATTRTUPLE disabled - provide mp_decode_uint_skip() to help reduce stack usage - makeqstrdefs.py: make script run correctly with Python 2.6 - objstringio: if created from immutable object, follow copy on write policy extmod: - modlwip: connect: for non-blocking mode, return EINPROGRESS - modlwip: fix error codes for duplicate calls to connect() - modlwip: accept: fix error code for non-blocking mode - vfs: allow to statvfs the root directory - vfs: allow "buffering" and "encoding" args to VFS's open() - modframebuf: fix signed/unsigned comparison pendantic warning lib: - libm: use isfinite instead of finitef, for C99 compatibility - utils/interrupt_char: remove support for KBD_EXCEPTION disabled tests: - basics/string_rsplit: add tests for negative "maxsplit" argument - float: convert "sys.exit()" to "raise SystemExit" - float/builtin_float_minmax: PEP8 fixes - basics: convert "sys.exit()" to "raise SystemExit" - convert remaining "sys.exit()" to "raise SystemExit" unix port: - convert to use core-provided version of built-in import() - Makefile: replace references to make with $(MAKE) windows port: - convert to use core-provided version of built-in import() qemu-arm port: - Makefile: adjust object-file lists to get correct dependencies - enable micropython.mem_*() functions to allow more tests stmhal port: - boards: enable DAC for NUCLEO_F767ZI board - add support for NUCLEO_F446RE board - pass USB handler as parameter to allow more than one USB handler - usb: use local USB handler variable in Start-of-Frame handler - usb: make state for USB device private to top-level USB driver - usbdev: for MSC implement SCSI SYNCHRONIZE_CACHE command - convert from using stmhal's input() to core provided version cc3200 port: - convert from using stmhal's input() to core provided version teensy port: - convert from using stmhal's input() to core provided version esp8266 port: - Makefile: replace references to make with $(MAKE) - Makefile: add clean-modules target - convert from using stmhal's input() to core provided version zephyr port: - modusocket: getaddrinfo: Fix mp_obj_len() usage - define MICROPY_PY_SYS_PLATFORM (to "zephyr") - machine_pin: use native Zephyr types for Zephyr API calls docs: - machine.Pin: remove out_value() method - machine.Pin: add on() and off() methods - esp8266: consistently replace Pin.high/low methods with .on/off - esp8266/quickref: polish Pin.on()/off() examples - network: move confusingly-named cc3200 Server class to its reference - uos: deconditionalize, remove minor port-specific details - uos: move cc3200 port legacy VFS mounting functions to its ref doc - machine: sort machine classes in logical order, not alphabetically - network: first step to describe standard network class interface examples: - embedding: use core-provided KeyboardInterrupt object
117 lines
3.8 KiB
C
117 lines
3.8 KiB
C
/*
|
|
* This file is part of the Micro Python project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014 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.
|
|
*/
|
|
#ifndef __MICROPY_INCLUDED_PY_NLR_H__
|
|
#define __MICROPY_INCLUDED_PY_NLR_H__
|
|
|
|
// non-local return
|
|
// exception handling, basically a stack of setjmp/longjmp buffers
|
|
|
|
#include <limits.h>
|
|
#include <setjmp.h>
|
|
#include <assert.h>
|
|
|
|
#include "py/mpconfig.h"
|
|
|
|
typedef struct _nlr_buf_t nlr_buf_t;
|
|
struct _nlr_buf_t {
|
|
// the entries here must all be machine word size
|
|
nlr_buf_t *prev;
|
|
void *ret_val; // always a concrete object (an exception instance)
|
|
#if !defined(MICROPY_NLR_SETJMP) || !MICROPY_NLR_SETJMP
|
|
#define MICROPY_NLR_SETJMP (0)
|
|
#if defined(__i386__)
|
|
void *regs[6];
|
|
#elif defined(__x86_64__)
|
|
#if defined(__CYGWIN__)
|
|
void *regs[12];
|
|
#else
|
|
void *regs[8];
|
|
#endif
|
|
#elif defined(__thumb2__) || defined(__thumb__) || defined(__arm__)
|
|
void *regs[10];
|
|
#elif defined(__xtensa__)
|
|
void *regs[10];
|
|
#else
|
|
#define MICROPY_NLR_SETJMP (1)
|
|
//#warning "No native NLR support for this arch, using setjmp implementation"
|
|
#endif
|
|
#endif
|
|
|
|
#if MICROPY_NLR_SETJMP
|
|
jmp_buf jmpbuf;
|
|
#endif
|
|
};
|
|
|
|
#if MICROPY_NLR_SETJMP
|
|
#include "py/mpstate.h"
|
|
|
|
NORETURN void nlr_setjmp_jump(void *val);
|
|
// nlr_push() must be defined as a macro, because "The stack context will be
|
|
// invalidated if the function which called setjmp() returns."
|
|
#define nlr_push(buf) ((buf)->prev = MP_STATE_THREAD(nlr_top), MP_STATE_THREAD(nlr_top) = (buf), setjmp((buf)->jmpbuf))
|
|
#define nlr_pop() { MP_STATE_THREAD(nlr_top) = MP_STATE_THREAD(nlr_top)->prev; }
|
|
#define nlr_jump(val) nlr_setjmp_jump(val)
|
|
#else
|
|
unsigned int nlr_push(nlr_buf_t *);
|
|
void nlr_pop(void);
|
|
NORETURN void nlr_jump(void *val);
|
|
#endif
|
|
|
|
// This must be implemented by a port. It's called by nlr_jump
|
|
// if no nlr buf has been pushed. It must not return, but rather
|
|
// should bail out with a fatal error.
|
|
NORETURN void nlr_jump_fail(void *val);
|
|
|
|
// use nlr_raise instead of nlr_jump so that debugging is easier
|
|
#ifndef MICROPY_DEBUG_NLR
|
|
#define nlr_raise(val) nlr_jump(MP_OBJ_TO_PTR(val))
|
|
#else
|
|
#include "mpstate.h"
|
|
#define nlr_raise(val) \
|
|
do { \
|
|
/*printf("nlr_raise: nlr_top=%p\n", MP_STATE_THREAD(nlr_top)); \
|
|
fflush(stdout);*/ \
|
|
void *_val = MP_OBJ_TO_PTR(val); \
|
|
assert(_val != NULL); \
|
|
assert(mp_obj_is_exception_instance(val)); \
|
|
nlr_jump(_val); \
|
|
} while (0)
|
|
|
|
#if !MICROPY_NLR_SETJMP
|
|
#define nlr_push(val) \
|
|
assert(MP_STATE_THREAD(nlr_top) != val),nlr_push(val)
|
|
|
|
/*
|
|
#define nlr_push(val) \
|
|
printf("nlr_push: before: nlr_top=%p, val=%p\n", MP_STATE_THREAD(nlr_top), val),assert(MP_STATE_THREAD(nlr_top) != val),nlr_push(val)
|
|
#endif
|
|
*/
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif // __MICROPY_INCLUDED_PY_NLR_H__
|