Skip to content

Commit b613364

Browse files
dhylandsdpgeorge
dhylands
authored and
dpgeorge
committed
stmhal: Add mem8/mem16/mem32 operations to machine module.
This uses the newly factored machine_mem functions.
1 parent d0f31cc commit b613364

3 files changed

Lines changed: 49 additions & 89 deletions

File tree

‎stmhal/modmachine.c‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "py/gc.h"
3131
#include "py/runtime.h"
3232
#include "py/mphal.h"
33+
#include "extmod/machine_mem.h"
3334
#include "lib/fatfs/ff.h"
3435
#include "lib/fatfs/diskio.h"
3536
#include "gccollect.h"
@@ -418,6 +419,42 @@ STATIC mp_obj_t machine_reset_cause(void) {
418419
STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
419420
#endif
420421

422+
// To use compile-time constants we are restricted to 31-bit numbers (a small int,
423+
// so it fits in a Micro Python object pointer). Thus, when extracting a constant
424+
// from an object, we must clear the MSB.
425+
426+
uintptr_t mod_machine_mem_get_read_addr(mp_obj_t addr_o, uint align) {
427+
uint32_t addr = mp_obj_get_int_truncated(addr_o);
428+
if (MP_OBJ_IS_SMALL_INT(addr_o)) {
429+
addr &= 0x7fffffff;
430+
}
431+
/*
432+
if (addr < 0x10000000) {
433+
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "cannot read from address %08x", addr));
434+
}
435+
*/
436+
if ((addr & (align - 1)) != 0) {
437+
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "address %08x is not aligned to %d bytes", addr, align));
438+
}
439+
return addr;
440+
}
441+
442+
uintptr_t mod_machine_mem_get_write_addr(mp_obj_t addr_o, uint align) {
443+
uint32_t addr = mp_obj_get_int_truncated(addr_o);
444+
if (MP_OBJ_IS_SMALL_INT(addr_o)) {
445+
addr &= 0x7fffffff;
446+
}
447+
if (addr < 0x10000000) {
448+
// Everything below 0x10000000 is either ROM or aliased to something higher, so we don't
449+
// lose anything by restricting writes to this area, and we gain some safety.
450+
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "cannot write to address %08x", addr));
451+
}
452+
if ((addr & (align - 1)) != 0) {
453+
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "address %08x is not aligned to %d bytes", addr, align));
454+
}
455+
return addr;
456+
}
457+
421458
STATIC const mp_map_elem_t machine_module_globals_table[] = {
422459
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_umachine) },
423460
{ MP_OBJ_NEW_QSTR(MP_QSTR_info), (mp_obj_t)&machine_info_obj },
@@ -439,6 +476,10 @@ STATIC const mp_map_elem_t machine_module_globals_table[] = {
439476
{ MP_OBJ_NEW_QSTR(MP_QSTR_disable_irq), (mp_obj_t)&pyb_disable_irq_obj },
440477
{ MP_OBJ_NEW_QSTR(MP_QSTR_enable_irq), (mp_obj_t)&pyb_enable_irq_obj },
441478

479+
{ MP_ROM_QSTR(MP_QSTR_mem8), (mp_obj_t)&machine_mem8_obj },
480+
{ MP_ROM_QSTR(MP_QSTR_mem16), (mp_obj_t)&machine_mem16_obj },
481+
{ MP_ROM_QSTR(MP_QSTR_mem32), (mp_obj_t)&machine_mem32_obj },
482+
442483
{ MP_OBJ_NEW_QSTR(MP_QSTR_Pin), (mp_obj_t)&pin_type },
443484

444485
#if 0

‎stmhal/modstm.c‎

Lines changed: 4 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -31,100 +31,15 @@
3131

3232
#include "py/nlr.h"
3333
#include "py/obj.h"
34+
#include "extmod/machine_mem.h"
3435
#include "portmodules.h"
3536

36-
// To use compile-time constants we are restricted to 31-bit numbers (a small int,
37-
// so it fits in a Micro Python object pointer). Thus, when extracting a constant
38-
// from an object, we must clear the MSB.
39-
40-
STATIC uint32_t get_read_addr(mp_obj_t addr_o, uint align) {
41-
uint32_t addr = mp_obj_get_int_truncated(addr_o);
42-
if (MP_OBJ_IS_SMALL_INT(addr_o)) {
43-
addr &= 0x7fffffff;
44-
}
45-
/*
46-
if (addr < 0x10000000) {
47-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "cannot read from address %08x", addr));
48-
}
49-
*/
50-
if ((addr & (align - 1)) != 0) {
51-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "address %08x is not aligned to %d bytes", addr, align));
52-
}
53-
return addr;
54-
}
55-
56-
STATIC uint32_t get_write_addr(mp_obj_t addr_o, uint align) {
57-
uint32_t addr = mp_obj_get_int_truncated(addr_o);
58-
if (MP_OBJ_IS_SMALL_INT(addr_o)) {
59-
addr &= 0x7fffffff;
60-
}
61-
if (addr < 0x10000000) {
62-
// Everything below 0x10000000 is either ROM or aliased to something higher, so we don't
63-
// lose anything by restricting writes to this area, and we gain some safety.
64-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "cannot write to address %08x", addr));
65-
}
66-
if ((addr & (align - 1)) != 0) {
67-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "address %08x is not aligned to %d bytes", addr, align));
68-
}
69-
return addr;
70-
}
71-
72-
typedef struct _stm_mem_obj_t {
73-
mp_obj_base_t base;
74-
uint32_t elem_size; // in bytes
75-
} stm_mem_obj_t;
76-
77-
STATIC void stm_mem_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
78-
stm_mem_obj_t *self = self_in;
79-
mp_printf(print, "<%u-bit memory>", 8 * self->elem_size);
80-
}
81-
82-
STATIC mp_obj_t stm_mem_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
83-
// TODO support slice index to read/write multiple values at once
84-
stm_mem_obj_t *self = self_in;
85-
if (value == MP_OBJ_NULL) {
86-
// delete
87-
return MP_OBJ_NULL; // op not supported
88-
} else if (value == MP_OBJ_SENTINEL) {
89-
// load
90-
uint32_t addr = get_read_addr(index, self->elem_size);
91-
uint32_t val;
92-
switch (self->elem_size) {
93-
case 1: val = (*(uint8_t*)addr); break;
94-
case 2: val = (*(uint16_t*)addr); break;
95-
default: val = (*(uint32_t*)addr); break;
96-
}
97-
return mp_obj_new_int_from_uint(val);
98-
} else {
99-
// store
100-
uint32_t addr = get_write_addr(index, self->elem_size);
101-
uint32_t val = mp_obj_get_int_truncated(value);
102-
switch (self->elem_size) {
103-
case 1: (*(uint8_t*)addr) = val; break;
104-
case 2: (*(uint16_t*)addr) = val; break;
105-
default: (*(uint32_t*)addr) = val; break;
106-
}
107-
return mp_const_none;
108-
}
109-
}
110-
111-
STATIC const mp_obj_type_t stm_mem_type = {
112-
{ &mp_type_type },
113-
.name = MP_QSTR_mem,
114-
.print = stm_mem_print,
115-
.subscr = stm_mem_subscr,
116-
};
117-
118-
STATIC const stm_mem_obj_t stm_mem8_obj = {{&stm_mem_type}, 1};
119-
STATIC const stm_mem_obj_t stm_mem16_obj = {{&stm_mem_type}, 2};
120-
STATIC const stm_mem_obj_t stm_mem32_obj = {{&stm_mem_type}, 4};
121-
12237
STATIC const mp_map_elem_t stm_module_globals_table[] = {
12338
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_stm) },
12439

125-
{ MP_OBJ_NEW_QSTR(MP_QSTR_mem8), (mp_obj_t)&stm_mem8_obj },
126-
{ MP_OBJ_NEW_QSTR(MP_QSTR_mem16), (mp_obj_t)&stm_mem16_obj },
127-
{ MP_OBJ_NEW_QSTR(MP_QSTR_mem32), (mp_obj_t)&stm_mem32_obj },
40+
{ MP_ROM_QSTR(MP_QSTR_mem8), (mp_obj_t)&machine_mem8_obj },
41+
{ MP_ROM_QSTR(MP_QSTR_mem16), (mp_obj_t)&machine_mem16_obj },
42+
{ MP_ROM_QSTR(MP_QSTR_mem32), (mp_obj_t)&machine_mem32_obj },
12843

12944
#include "genhdr/modstm_const.h"
13045
};

‎stmhal/mpconfigport.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@
8686
#define MICROPY_PY_UHEAPQ (1)
8787
#define MICROPY_PY_UHASHLIB (1)
8888

89+
#define MICROPY_PY_MACHINE (1)
90+
#define MICROPY_MACHINE_MEM_GET_READ_ADDR mod_machine_mem_get_read_addr
91+
#define MICROPY_MACHINE_MEM_GET_WRITE_ADDR mod_machine_mem_get_write_addr
92+
8993
#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
9094
#define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (0)
9195

0 commit comments

Comments
 (0)