diff options
Diffstat (limited to 'py/emitx64.c')
| -rw-r--r-- | py/emitx64.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/py/emitx64.c b/py/emitx64.c index 5b2b6f0c5..f4ec37d7e 100644 --- a/py/emitx64.c +++ b/py/emitx64.c @@ -39,8 +39,8 @@ typedef enum { NEED_TO_PUSH_NOTHING, - NEED_TO_PUSH_R64, - NEED_TO_PUSH_I64, + NEED_TO_PUSH_REG, + NEED_TO_PUSH_IMM, } need_to_push_t; typedef enum { @@ -185,13 +185,13 @@ static void stack_settle(emit_t *emit) { case NEED_TO_PUSH_NOTHING: break; - case NEED_TO_PUSH_R64: + case NEED_TO_PUSH_REG: emit->stack_vtype[emit->stack_size] = emit->last_vtype; asm_x64_mov_r64_to_local(emit->as, emit->last_reg, emit->stack_start + emit->stack_size); adjust_stack(emit, 1); break; - case NEED_TO_PUSH_I64: + case NEED_TO_PUSH_IMM: emit->stack_vtype[emit->stack_size] = emit->last_vtype; asm_x64_mov_i64_to_r64_optimised(emit->as, emit->last_imm, REG_RAX); asm_x64_mov_r64_to_local(emit->as, REG_RAX, emit->stack_start + emit->stack_size); @@ -216,8 +216,8 @@ static vtype_kind_t peek_vtype(emit_t *emit) { case NEED_TO_PUSH_NOTHING: return emit->stack_vtype[emit->stack_size - 1]; - case NEED_TO_PUSH_R64: - case NEED_TO_PUSH_I64: + case NEED_TO_PUSH_REG: + case NEED_TO_PUSH_IMM: return emit->last_vtype; default: @@ -234,7 +234,7 @@ static void emit_pre_pop_reg(emit_t *emit, vtype_kind_t *vtype, int reg) { emit_pre_raw(emit, -1); break; - case NEED_TO_PUSH_R64: + case NEED_TO_PUSH_REG: emit_pre_raw(emit, 0); *vtype = emit->last_vtype; if (emit->last_reg != reg) { @@ -242,7 +242,7 @@ static void emit_pre_pop_reg(emit_t *emit, vtype_kind_t *vtype, int reg) { } break; - case NEED_TO_PUSH_I64: + case NEED_TO_PUSH_IMM: emit_pre_raw(emit, 0); *vtype = emit->last_vtype; asm_x64_mov_i64_to_r64_optimised(emit->as, emit->last_imm, reg); @@ -251,19 +251,19 @@ static void emit_pre_pop_reg(emit_t *emit, vtype_kind_t *vtype, int reg) { emit->need_to_push = NEED_TO_PUSH_NOTHING; } -static void emit_pre_pop_reg_reg(emit_t *emit, vtype_kind_t *vtypea, int r64a, vtype_kind_t *vtypeb, int r64b) { - emit_pre_pop_reg(emit, vtypea, r64a); +static void emit_pre_pop_reg_reg(emit_t *emit, vtype_kind_t *vtypea, int rega, vtype_kind_t *vtypeb, int regb) { + emit_pre_pop_reg(emit, vtypea, rega); *vtypeb = emit->stack_vtype[emit->stack_size - 1]; - asm_x64_mov_local_to_r64(emit->as, emit->stack_start + emit->stack_size - 1, r64b); + asm_x64_mov_local_to_r64(emit->as, emit->stack_start + emit->stack_size - 1, regb); adjust_stack(emit, -1); } -static void emit_pre_pop_reg_reg_reg(emit_t *emit, vtype_kind_t *vtypea, int r64a, vtype_kind_t *vtypeb, int r64b, vtype_kind_t *vtypec, int r64c) { - emit_pre_pop_reg(emit, vtypea, r64a); +static void emit_pre_pop_reg_reg_reg(emit_t *emit, vtype_kind_t *vtypea, int rega, vtype_kind_t *vtypeb, int regb, vtype_kind_t *vtypec, int regc) { + emit_pre_pop_reg(emit, vtypea, rega); *vtypeb = emit->stack_vtype[emit->stack_size - 1]; *vtypec = emit->stack_vtype[emit->stack_size - 2]; - asm_x64_mov_local_to_r64(emit->as, emit->stack_start + emit->stack_size - 1, r64b); - asm_x64_mov_local_to_r64(emit->as, emit->stack_start + emit->stack_size - 2, r64c); + asm_x64_mov_local_to_r64(emit->as, emit->stack_start + emit->stack_size - 1, regb); + asm_x64_mov_local_to_r64(emit->as, emit->stack_start + emit->stack_size - 2, regc); adjust_stack(emit, -2); } @@ -271,45 +271,45 @@ static void emit_post(emit_t *emit) { } static void emit_post_push_reg(emit_t *emit, vtype_kind_t vtype, int reg) { - emit->need_to_push = NEED_TO_PUSH_R64; + emit->need_to_push = NEED_TO_PUSH_REG; emit->last_vtype = vtype; emit->last_reg = reg; } static void emit_post_push_imm(emit_t *emit, vtype_kind_t vtype, int64_t imm) { - emit->need_to_push = NEED_TO_PUSH_I64; + emit->need_to_push = NEED_TO_PUSH_IMM; emit->last_vtype = vtype; emit->last_imm = imm; } -static void emit_post_push_reg_reg(emit_t *emit, vtype_kind_t vtypea, int r64a, vtype_kind_t vtypeb, int r64b) { +static void emit_post_push_reg_reg(emit_t *emit, vtype_kind_t vtypea, int rega, vtype_kind_t vtypeb, int regb) { emit->stack_vtype[emit->stack_size] = vtypea; - asm_x64_mov_r64_to_local(emit->as, r64a, emit->stack_start + emit->stack_size); - emit->need_to_push = NEED_TO_PUSH_R64; + asm_x64_mov_r64_to_local(emit->as, rega, emit->stack_start + emit->stack_size); + emit->need_to_push = NEED_TO_PUSH_REG; emit->last_vtype = vtypeb; - emit->last_reg = r64b; + emit->last_reg = regb; adjust_stack(emit, 1); } -static void emit_post_push_reg_reg_reg(emit_t *emit, vtype_kind_t vtypea, int r64a, vtype_kind_t vtypeb, int r64b, vtype_kind_t vtypec, int r64c) { +static void emit_post_push_reg_reg_reg(emit_t *emit, vtype_kind_t vtypea, int rega, vtype_kind_t vtypeb, int regb, vtype_kind_t vtypec, int regc) { emit->stack_vtype[emit->stack_size] = vtypea; emit->stack_vtype[emit->stack_size + 1] = vtypeb; emit->stack_vtype[emit->stack_size + 2] = vtypec; - asm_x64_mov_r64_to_local(emit->as, r64a, emit->stack_start + emit->stack_size); - asm_x64_mov_r64_to_local(emit->as, r64b, emit->stack_start + emit->stack_size + 1); - asm_x64_mov_r64_to_local(emit->as, r64c, emit->stack_start + emit->stack_size + 2); + asm_x64_mov_r64_to_local(emit->as, rega, emit->stack_start + emit->stack_size); + asm_x64_mov_r64_to_local(emit->as, regb, emit->stack_start + emit->stack_size + 1); + asm_x64_mov_r64_to_local(emit->as, regc, emit->stack_start + emit->stack_size + 2); adjust_stack(emit, 3); } -static void emit_post_push_reg_reg_reg_reg(emit_t *emit, vtype_kind_t vtypea, int r64a, vtype_kind_t vtypeb, int r64b, vtype_kind_t vtypec, int r64c, vtype_kind_t vtyped, int r64d) { +static void emit_post_push_reg_reg_reg_reg(emit_t *emit, vtype_kind_t vtypea, int rega, vtype_kind_t vtypeb, int regb, vtype_kind_t vtypec, int regc, vtype_kind_t vtyped, int regd) { emit->stack_vtype[emit->stack_size] = vtypea; emit->stack_vtype[emit->stack_size + 1] = vtypeb; emit->stack_vtype[emit->stack_size + 2] = vtypec; emit->stack_vtype[emit->stack_size + 3] = vtyped; - asm_x64_mov_r64_to_local(emit->as, r64a, emit->stack_start + emit->stack_size); - asm_x64_mov_r64_to_local(emit->as, r64b, emit->stack_start + emit->stack_size + 1); - asm_x64_mov_r64_to_local(emit->as, r64c, emit->stack_start + emit->stack_size + 2); - asm_x64_mov_r64_to_local(emit->as, r64d, emit->stack_start + emit->stack_size + 3); + asm_x64_mov_r64_to_local(emit->as, rega, emit->stack_start + emit->stack_size); + asm_x64_mov_r64_to_local(emit->as, regb, emit->stack_start + emit->stack_size + 1); + asm_x64_mov_r64_to_local(emit->as, regc, emit->stack_start + emit->stack_size + 2); + asm_x64_mov_r64_to_local(emit->as, regd, emit->stack_start + emit->stack_size + 3); adjust_stack(emit, 4); } |
