aboutsummaryrefslogtreecommitdiff
path: root/py/nlrthumb.S
diff options
context:
space:
mode:
authorDamien George2015-01-01 23:30:53 +0000
committerDamien George2015-01-07 20:33:00 +0000
commitb4b10fd350852e321624d74983cca286091b55a1 (patch)
tree7ac4aa40d70be0170a61f649e9d73c42faa4ba33 /py/nlrthumb.S
parentad2307c92c15f0aa90dbd0741fd2538719d0b5e1 (diff)
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.
Diffstat (limited to 'py/nlrthumb.S')
-rw-r--r--py/nlrthumb.S5
1 files changed, 4 insertions, 1 deletions
diff --git a/py/nlrthumb.S b/py/nlrthumb.S
index 761f83556..c6db844f8 100644
--- a/py/nlrthumb.S
+++ b/py/nlrthumb.S
@@ -32,6 +32,9 @@
// For reference, arm/thumb callee save regs are:
// r4-r11, r13=sp
+// the offset of nlr_top within mp_state_ctx_t
+#define NLR_TOP_OFFSET (2 * 4)
+
.syntax unified
/*.cpu cortex-m4*/
/*.thumb*/
@@ -68,7 +71,7 @@ nlr_push:
bx lr @ return
.align 2
nlr_top_addr:
- .word nlr_top
+ .word mp_state_ctx + NLR_TOP_OFFSET
.size nlr_push, .-nlr_push
/**************************************/