mirror of
https://github.com/licsber/micropython.git
synced 2024-09-20 17:10:24 +08:00
922f81dfd1
Prior to this change machine.mem32['foo'] (or using any other non-integer subscript) could result in a fault due to 'foo' being interpreted as an integer. And when writing code it's hard to tell if the fault is due to a bad subscript type, or an integer subscript that specifies an invalid memory address. The type of the object used in the subscript is now tested to be an integer by using mp_obj_get_int_truncated instead of mp_obj_int_get_truncated. The performance hit of this change is minimal, and machine.memX objects are more for convenience than performance (there are many other ways to read/write memory in a faster way), Fixes issue #6588.
114 lines
3.8 KiB
C
114 lines
3.8 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
|
* Copyright (c) 2015 Paul Sokolovsky
|
|
*
|
|
* 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 <stdio.h>
|
|
#include <stdint.h>
|
|
|
|
#include "py/runtime.h"
|
|
#include "py/obj.h"
|
|
|
|
#include "extmod/machine_mem.h"
|
|
#include "extmod/machine_pinbase.h"
|
|
#include "extmod/machine_signal.h"
|
|
#include "extmod/machine_pulse.h"
|
|
|
|
#if MICROPY_PLAT_DEV_MEM
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <sys/mman.h>
|
|
#define MICROPY_PAGE_SIZE 4096
|
|
#define MICROPY_PAGE_MASK (MICROPY_PAGE_SIZE - 1)
|
|
#endif
|
|
|
|
#if MICROPY_PY_MACHINE
|
|
|
|
uintptr_t mod_machine_mem_get_addr(mp_obj_t addr_o, uint align) {
|
|
uintptr_t addr = mp_obj_get_int_truncated(addr_o);
|
|
if ((addr & (align - 1)) != 0) {
|
|
mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("address %08x is not aligned to %d bytes"), addr, align);
|
|
}
|
|
#if MICROPY_PLAT_DEV_MEM
|
|
{
|
|
// Not thread-safe
|
|
static int fd;
|
|
static uintptr_t last_base = (uintptr_t)-1;
|
|
static uintptr_t map_page;
|
|
if (!fd) {
|
|
int _fd = open("/dev/mem", O_RDWR | O_SYNC);
|
|
if (_fd == -1) {
|
|
mp_raise_OSError(errno);
|
|
}
|
|
fd = _fd;
|
|
}
|
|
|
|
uintptr_t cur_base = addr & ~MICROPY_PAGE_MASK;
|
|
if (cur_base != last_base) {
|
|
map_page = (uintptr_t)mmap(NULL, MICROPY_PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, cur_base);
|
|
last_base = cur_base;
|
|
}
|
|
addr = map_page + (addr & MICROPY_PAGE_MASK);
|
|
}
|
|
#endif
|
|
|
|
return addr;
|
|
}
|
|
|
|
#ifdef MICROPY_UNIX_MACHINE_IDLE
|
|
STATIC mp_obj_t machine_idle(void) {
|
|
MICROPY_UNIX_MACHINE_IDLE
|
|
return mp_const_none;
|
|
}
|
|
MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
|
|
#endif
|
|
|
|
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) },
|
|
|
|
#ifdef MICROPY_UNIX_MACHINE_IDLE
|
|
{ MP_ROM_QSTR(MP_QSTR_idle), MP_ROM_PTR(&machine_idle_obj) },
|
|
#endif
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_PinBase), MP_ROM_PTR(&machine_pinbase_type) },
|
|
{ MP_ROM_QSTR(MP_QSTR_Signal), MP_ROM_PTR(&machine_signal_type) },
|
|
#if MICROPY_PY_MACHINE_PULSE
|
|
{ MP_ROM_QSTR(MP_QSTR_time_pulse_us), MP_ROM_PTR(&machine_time_pulse_us_obj) },
|
|
#endif
|
|
};
|
|
|
|
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,
|
|
};
|
|
|
|
#endif // MICROPY_PY_MACHINE
|