|
37 | 37 |
|
38 | 38 | #if defined(__APPLE__) && defined(__MACH__) |
39 | 39 | #define NLR_TOP (_mp_state_ctx + NLR_TOP_OFFSET) |
| 40 | +#define MP_THREAD_GET_STATE _mp_thread_get_state |
40 | 41 | #else |
41 | 42 | #define NLR_TOP (mp_state_ctx + NLR_TOP_OFFSET) |
| 43 | +#define MP_THREAD_GET_STATE mp_thread_get_state |
42 | 44 | #endif |
43 | 45 |
|
44 | 46 | // offset of nlr_top within mp_state_thread_t structure |
@@ -87,7 +89,7 @@ _nlr_push: |
87 | 89 | movq %rdi, NLR_TOP(%rip) # stor new nlr_buf (to make linked list) |
88 | 90 | #else |
89 | 91 | movq %rdi, %rbp # since we make a call, must save rdi in rbp |
90 | | - callq mp_thread_get_state # get mp_state_thread ptr into rax |
| 92 | + callq MP_THREAD_GET_STATE # get mp_state_thread ptr into rax |
91 | 93 | movq NLR_TOP_TH_OFF(%rax), %rsi # get thread.nlr_top (last nlr_buf) |
92 | 94 | movq %rsi, (%rbp) # store it |
93 | 95 | movq %rbp, NLR_TOP_TH_OFF(%rax) # store new nlr_buf (to make linked list) |
@@ -117,7 +119,7 @@ _nlr_pop: |
117 | 119 | movq (%rax), %rax # load prev nlr_buf |
118 | 120 | movq %rax, NLR_TOP(%rip) # store prev nlr_buf (to unlink list) |
119 | 121 | #else |
120 | | - callq mp_thread_get_state # get mp_state_thread ptr into rax |
| 122 | + callq MP_THREAD_GET_STATE # get mp_state_thread ptr into rax |
121 | 123 | movq NLR_TOP_TH_OFF(%rax), %rdi # get thread.nlr_top (last nlr_buf) |
122 | 124 | movq (%rdi), %rdi # load prev nlr_buf |
123 | 125 | movq %rdi, NLR_TOP_TH_OFF(%rax) # store prev nlr_buf (to unlink list) |
@@ -150,7 +152,7 @@ nlr_jump: |
150 | 152 | movq %rax, NLR_TOP(%rip) # store prev nlr_buf (to unlink list) |
151 | 153 | #else |
152 | 154 | movq %rdi, %rbp # put return value in rbp |
153 | | - callq mp_thread_get_state # get thread ptr in rax |
| 155 | + callq MP_THREAD_GET_STATE # get thread ptr in rax |
154 | 156 | movq %rax, %rsi # put thread ptr in rsi |
155 | 157 | movq %rbp, %rax # put return value to rax (for je .fail) |
156 | 158 | movq NLR_TOP_TH_OFF(%rsi), %rdi # get thread.nlr_top in rdi |
|
0 commit comments