summaryrefslogtreecommitdiffstatshomepage
path: root/py
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2019-12-22 23:13:01 +1100
committerDamien George <damien.p.george@gmail.com>2019-12-27 12:30:51 +1100
commitab75210e3338fbcc975b3c04e047ac553690f429 (patch)
tree2252ee636f9f304ed2517cde4cc74762cbd3499c /py
parentb97fb683d0923d29f55cf54fc2fd5cc19186536e (diff)
downloadmicropython-ab75210e3338fbcc975b3c04e047ac553690f429.tar.gz
micropython-ab75210e3338fbcc975b3c04e047ac553690f429.zip
py/asmx86: Remove unused 5th argument facility.
In commit 71a3d6ec3bd02c5bd13334537e1bd146bb643bad mp_setup_code_state was changed from a 5-arg function to a 4-arg function, and at that point 5-arg calls in native code were no longer needed. See also commit 4f9842ad80c235188955fd83317f715033a596c0.
Diffstat (limited to 'py')
-rw-r--r--py/asmx86.c5
-rw-r--r--py/asmx86.h2
2 files changed, 1 insertions, 6 deletions
diff --git a/py/asmx86.c b/py/asmx86.c
index e4736251f8..e69d06d8bb 100644
--- a/py/asmx86.c
+++ b/py/asmx86.c
@@ -497,7 +497,7 @@ void asm_x86_push_local_addr(asm_x86_t *as, int local_num, int temp_r32)
#endif
void asm_x86_call_ind(asm_x86_t *as, size_t fun_id, mp_uint_t n_args, int temp_r32) {
- assert(n_args <= 5);
+ assert(n_args <= 4);
// Align stack on 16-byte boundary during the call
unsigned int align = ((n_args + 3) & ~3) - n_args;
@@ -505,9 +505,6 @@ void asm_x86_call_ind(asm_x86_t *as, size_t fun_id, mp_uint_t n_args, int temp_r
asm_x86_sub_r32_i32(as, ASM_X86_REG_ESP, align * WORD_SIZE);
}
- if (n_args > 4) {
- asm_x86_push_r32(as, ASM_X86_REG_ARG_5);
- }
if (n_args > 3) {
asm_x86_push_r32(as, ASM_X86_REG_ARG_4);
}
diff --git a/py/asmx86.h b/py/asmx86.h
index 7ba677b2c2..abcea18030 100644
--- a/py/asmx86.h
+++ b/py/asmx86.h
@@ -60,7 +60,6 @@
#define ASM_X86_REG_ARG_2 ASM_X86_REG_ECX
#define ASM_X86_REG_ARG_3 ASM_X86_REG_EDX
#define ASM_X86_REG_ARG_4 ASM_X86_REG_EBX
-#define ASM_X86_REG_ARG_5 ASM_X86_REG_ESI
// condition codes, used for jcc and setcc (despite their j-name!)
#define ASM_X86_CC_JB (0x2) // below, unsigned
@@ -129,7 +128,6 @@ void asm_x86_call_ind(asm_x86_t* as, size_t fun_id, mp_uint_t n_args, int temp_r
#define REG_ARG_2 ASM_X86_REG_ARG_2
#define REG_ARG_3 ASM_X86_REG_ARG_3
#define REG_ARG_4 ASM_X86_REG_ARG_4
-#define REG_ARG_5 ASM_X86_REG_ARG_5
// caller-save, so can be used as temporaries
#define REG_TEMP0 ASM_X86_REG_EAX