summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lechner <david@pybricks.com>2022-07-01 16:08:57 -0500
committerDamien George <damien@micropython.org>2022-07-18 13:51:16 +1000
commit7e4b205cb00013b272e4cf9fac128866bf0e1f21 (patch)
treea39e14df61be00b0f4eb9c4e7265dcf00669671c
parentccda7686a436f4d172325cce1fbf1d49165e31fd (diff)
py/mpstate: Drop MICROPY_PORT_ROOT_POINTERS from mp_state_vm_t.
All in-tree uses of MICROPY_PORT_ROOT_POINTERS have been replaced with MP_REGISTER_ROOT_POINTER(), so now we can remove both MICROPY_PORT_ROOT_POINTERS and MICROPY_BOARD_ROOT_POINTERS from the code and remaining config files. Signed-off-by: David Lechner <david@pybricks.com>
-rw-r--r--ports/mimxrt/mpconfigport.h8
-rw-r--r--ports/renesas-ra/mpconfigport.h8
-rw-r--r--ports/rp2/mpconfigport.h7
-rw-r--r--ports/stm32/mpconfigport.h8
-rw-r--r--ports/unix/variants/minimal/mpconfigvariant.h2
-rw-r--r--py/mpconfig.h5
-rw-r--r--py/mpstate.h3
7 files changed, 0 insertions, 41 deletions
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 2c7446e36..676e563c7 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -237,14 +237,6 @@ extern const struct _mp_obj_type_t network_lan_type;
#define MICROPY_HW_PIT_NUM_CHANNELS 3
-#ifndef MICROPY_BOARD_ROOT_POINTERS
-#define MICROPY_BOARD_ROOT_POINTERS
-#endif
-
-#define MICROPY_PORT_ROOT_POINTERS \
- /* root pointers defined by a board */ \
- MICROPY_BOARD_ROOT_POINTERS \
-
#define MP_STATE_PORT MP_STATE_VM
// Miscellaneous settings
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 0f1d59303..8ecc17fcb 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -163,14 +163,6 @@
#define MP_STATE_PORT MP_STATE_VM
-#ifndef MICROPY_BOARD_ROOT_POINTERS
-#define MICROPY_BOARD_ROOT_POINTERS
-#endif
-
-#define MICROPY_PORT_ROOT_POINTERS \
- /* root pointers defined by a board */ \
- MICROPY_BOARD_ROOT_POINTERS \
-
// type definitions for the specific machine
#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((uint32_t)(p) | 1))
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 82e8de14d..3f332b6a8 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -204,13 +204,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
MICROPY_HW_NIC_WIZNET5K \
MICROPY_BOARD_NETWORK_INTERFACES \
-#ifndef MICROPY_BOARD_ROOT_POINTERS
-#define MICROPY_BOARD_ROOT_POINTERS
-#endif
-
-#define MICROPY_PORT_ROOT_POINTERS \
- MICROPY_BOARD_ROOT_POINTERS \
-
#define MP_STATE_PORT MP_STATE_VM
// Miscellaneous settings
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index bb73b8337..e44fa2260 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -238,14 +238,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_cc3k;
#define MP_STATE_PORT MP_STATE_VM
-#ifndef MICROPY_BOARD_ROOT_POINTERS
-#define MICROPY_BOARD_ROOT_POINTERS
-#endif
-
-#define MICROPY_PORT_ROOT_POINTERS \
- /* root pointers defined by a board */ \
- MICROPY_BOARD_ROOT_POINTERS \
-
// type definitions for the specific machine
#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((uint32_t)(p) | 1))
diff --git a/ports/unix/variants/minimal/mpconfigvariant.h b/ports/unix/variants/minimal/mpconfigvariant.h
index 60d194b6a..1e378e94d 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.h
+++ b/ports/unix/variants/minimal/mpconfigvariant.h
@@ -107,8 +107,6 @@
#define MICROPY_PY_UHASHLIB (0)
#define MICROPY_PY_UBINASCII (0)
-#define MICROPY_PORT_ROOT_POINTERS \
-
#define mp_type_fileio mp_type_vfs_posix_fileio
#define mp_type_textio mp_type_vfs_posix_textio
diff --git a/py/mpconfig.h b/py/mpconfig.h
index adaa3ec1f..ee0123be3 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1659,11 +1659,6 @@ typedef double mp_float_t;
#define MICROPY_PORT_CONSTANTS
#endif
-// Any root pointers for GC scanning - see mpstate.c
-#ifndef MICROPY_PORT_ROOT_POINTERS
-#define MICROPY_PORT_ROOT_POINTERS
-#endif
-
/*****************************************************************************/
/* Hooks for a port to wrap functions with attributes */
diff --git a/py/mpstate.h b/py/mpstate.h
index 07a4f3860..b51e72cd8 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -189,9 +189,6 @@ typedef struct _mp_state_vm_t {
mp_obj_t track_reloc_code_list;
#endif
- // include any root pointers defined by a port
- MICROPY_PORT_ROOT_POINTERS
-
// Include any root pointers registered with MP_REGISTER_ROOT_POINTER().
#ifndef NO_QSTR
// Only include root pointer definitions when not doing qstr extraction, because