all: Reformat C and Python source code with tools/codeformat.py.
This is run with uncrustify 0.70.1, and black 19.10b0.
This commit is contained in:
58
py/nlrx86.c
58
py/nlrx86.c
@@ -34,7 +34,7 @@
|
||||
// ebx, esi, edi, ebp, esp, eip
|
||||
|
||||
#if MICROPY_NLR_OS_WINDOWS
|
||||
unsigned int nlr_push_tail(nlr_buf_t *nlr) asm("nlr_push_tail");
|
||||
unsigned int nlr_push_tail(nlr_buf_t *nlr) asm ("nlr_push_tail");
|
||||
#else
|
||||
__attribute__((used)) unsigned int nlr_push_tail(nlr_buf_t *nlr);
|
||||
#endif
|
||||
@@ -59,19 +59,19 @@ unsigned int nlr_push(nlr_buf_t *nlr) {
|
||||
(void)nlr;
|
||||
|
||||
__asm volatile (
|
||||
#if UNDO_PRELUDE
|
||||
"pop %ebp \n" // undo function's prelude
|
||||
#endif
|
||||
"mov 4(%esp), %edx \n" // load nlr_buf
|
||||
"mov (%esp), %eax \n" // load return %eip
|
||||
"mov %eax, 8(%edx) \n" // store %eip into nlr_buf
|
||||
"mov %ebp, 12(%edx) \n" // store %ebp into nlr_buf
|
||||
"mov %esp, 16(%edx) \n" // store %esp into nlr_buf
|
||||
"mov %ebx, 20(%edx) \n" // store %ebx into nlr_buf
|
||||
"mov %edi, 24(%edx) \n" // store %edi into nlr_buf
|
||||
"mov %esi, 28(%edx) \n" // store %esi into nlr_buf
|
||||
"jmp nlr_push_tail \n" // do the rest in C
|
||||
);
|
||||
#if UNDO_PRELUDE
|
||||
"pop %ebp \n" // undo function's prelude
|
||||
#endif
|
||||
"mov 4(%esp), %edx \n" // load nlr_buf
|
||||
"mov (%esp), %eax \n" // load return %eip
|
||||
"mov %eax, 8(%edx) \n" // store %eip into nlr_buf
|
||||
"mov %ebp, 12(%edx) \n" // store %ebp into nlr_buf
|
||||
"mov %esp, 16(%edx) \n" // store %esp into nlr_buf
|
||||
"mov %ebx, 20(%edx) \n" // store %ebx into nlr_buf
|
||||
"mov %edi, 24(%edx) \n" // store %edi into nlr_buf
|
||||
"mov %esi, 28(%edx) \n" // store %esi into nlr_buf
|
||||
"jmp nlr_push_tail \n" // do the rest in C
|
||||
);
|
||||
|
||||
#if !USE_NAKED
|
||||
return 0; // needed to silence compiler warning
|
||||
@@ -82,21 +82,21 @@ NORETURN void nlr_jump(void *val) {
|
||||
MP_NLR_JUMP_HEAD(val, top)
|
||||
|
||||
__asm volatile (
|
||||
"mov %0, %%edx \n" // %edx points to nlr_buf
|
||||
"mov 28(%%edx), %%esi \n" // load saved %esi
|
||||
"mov 24(%%edx), %%edi \n" // load saved %edi
|
||||
"mov 20(%%edx), %%ebx \n" // load saved %ebx
|
||||
"mov 16(%%edx), %%esp \n" // load saved %esp
|
||||
"mov 12(%%edx), %%ebp \n" // load saved %ebp
|
||||
"mov 8(%%edx), %%eax \n" // load saved %eip
|
||||
"mov %%eax, (%%esp) \n" // store saved %eip to stack
|
||||
"xor %%eax, %%eax \n" // clear return register
|
||||
"inc %%al \n" // increase to make 1, non-local return
|
||||
"ret \n" // return
|
||||
: // output operands
|
||||
: "r"(top) // input operands
|
||||
: // clobbered registers
|
||||
);
|
||||
"mov %0, %%edx \n" // %edx points to nlr_buf
|
||||
"mov 28(%%edx), %%esi \n" // load saved %esi
|
||||
"mov 24(%%edx), %%edi \n" // load saved %edi
|
||||
"mov 20(%%edx), %%ebx \n" // load saved %ebx
|
||||
"mov 16(%%edx), %%esp \n" // load saved %esp
|
||||
"mov 12(%%edx), %%ebp \n" // load saved %ebp
|
||||
"mov 8(%%edx), %%eax \n" // load saved %eip
|
||||
"mov %%eax, (%%esp) \n" // store saved %eip to stack
|
||||
"xor %%eax, %%eax \n" // clear return register
|
||||
"inc %%al \n" // increase to make 1, non-local return
|
||||
"ret \n" // return
|
||||
: // output operands
|
||||
: "r" (top) // input operands
|
||||
: // clobbered registers
|
||||
);
|
||||
|
||||
MP_UNREACHABLE
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user