From 054848a1b8aa7e52f3c70e86cc4dc56b565ea830 Mon Sep 17 00:00:00 2001
From: Damien <damien.p.george@gmail.com>
Date: Sat, 5 Oct 2013 13:44:41 +0100
Subject: [PATCH] Compiler computes labels and max_num_labels.
---
py/asmx64.c | 133 +++++++++++++++++++++++----------------------------
py/asmx64.h | 1 -
py/compile.c | 4 +-
py/emit.h | 1 -
py/emitbc.c | 5 --
py/emitcpy.c | 5 --
py/emitx64.c | 5 --
7 files changed, 61 insertions(+), 93 deletions(-)
diff --git a/py/asmx64.c b/py/asmx64.c
index ca461e0c2..4fbd44f98 100644
--- a/py/asmx64.c
+++ b/py/asmx64.c
@@ -81,8 +81,7 @@ struct _asm_x64_t {
byte *code_base;
byte dummy_data[8];
- int next_label;
- int max_num_labels;
+ uint max_num_labels;
int *label_offsets;
};
@@ -98,7 +97,7 @@ void *alloc_mem(uint req_size, uint *alloc_size, bool is_exec) {
return ptr;
}
-asm_x64_t* asm_x64_new() {
+asm_x64_t* asm_x64_new(uint max_num_labels) {
asm_x64_t* as;
as = m_new(asm_x64_t, 1);
@@ -106,7 +105,8 @@ asm_x64_t* asm_x64_new() {
as->code_offset = 0;
as->code_size = 0;
as->code_base = NULL;
- as->label_offsets = NULL;
+ as->max_num_labels = max_num_labels;
+ as->label_offsets = m_new(int, max_num_labels);
return as;
}
@@ -134,29 +134,19 @@ void asm_x64_free(asm_x64_t* as, bool free_code) {
void asm_x64_start_pass(asm_x64_t *as, int pass) {
as->pass = pass;
as->code_offset = 0;
- as->next_label = 1;
- if (pass == ASM_X64_PASS_1) {
- as->max_num_labels = 0;
- } else {
- if (pass == ASM_X64_PASS_2) {
- memset(as->label_offsets, -1, as->max_num_labels * sizeof(int));
- }
+ if (pass == ASM_X64_PASS_2) {
+ // reset all labels
+ memset(as->label_offsets, -1, as->max_num_labels * sizeof(int));
}
}
void asm_x64_end_pass(asm_x64_t *as) {
- if (as->pass == ASM_X64_PASS_1) {
- // calculate number of labels need
- if (as->next_label > as->max_num_labels) {
- as->max_num_labels = as->next_label;
- }
- as->label_offsets = m_new(int, as->max_num_labels);
- } else if (as->pass == ASM_X64_PASS_2) {
+ if (as->pass == ASM_X64_PASS_2) {
// calculate size of code in bytes
as->code_size = as->code_offset;
- as->code_base = m_new(byte, as->code_size);
- //uint actual_alloc;
- //as->code_base = alloc_mem(as->code_size, &actual_alloc, true);
+ //as->code_base = m_new(byte, as->code_size); need to allocale executable memory
+ uint actual_alloc;
+ as->code_base = alloc_mem(as->code_size, &actual_alloc, true);
printf("code_size: %u\n", as->code_size);
}
@@ -458,70 +448,65 @@ void asm_x64_setcc_r8(asm_x64_t* as, int jcc_type, int dest_r8) {
asm_x64_write_byte_3(as, OPCODE_SETCC_RM8_A, OPCODE_SETCC_RM8_B | jcc_type, MODRM_R64(0) | MODRM_RM_REG | MODRM_RM_R64(dest_r8));
}
-int asm_x64_label_new(asm_x64_t* as) {
- return as->next_label++;
-}
-
void asm_x64_label_assign(asm_x64_t* as, int label) {
- if (as->pass > ASM_X64_PASS_1) {
- assert(label < as->max_num_labels);
- if (as->pass == ASM_X64_PASS_2) {
- // assign label offset
- assert(as->label_offsets[label] == -1);
- as->label_offsets[label] = as->code_offset;
- } else if (as->pass == ASM_X64_PASS_3) {
- // ensure label offset has not changed from PASS_2 to PASS_3
- //printf("l%d: (at %d=%ld)\n", label, as->label_offsets[label], as->code_offset);
- assert(as->label_offsets[label] == as->code_offset);
- }
+ assert(label < as->max_num_labels);
+ if (as->pass == ASM_X64_PASS_2) {
+ // assign label offset
+ assert(as->label_offsets[label] == -1);
+ as->label_offsets[label] = as->code_offset;
+ } else if (as->pass == ASM_X64_PASS_3) {
+ // ensure label offset has not changed from PASS_2 to PASS_3
+ //printf("l%d: (at %d=%ld)\n", label, as->label_offsets[label], as->code_offset);
+ assert(as->label_offsets[label] == as->code_offset);
}
}
-void asm_x64_jmp_label(asm_x64_t* as, int label) {
- if (as->pass > ASM_X64_PASS_1) {
- int dest = as->label_offsets[label];
- int rel = dest - as->code_offset;
- if (dest >= 0 && rel < 0) {
- // is a backwards jump, so we know the size of the jump on the first pass
- // calculate rel assuming 8 bit relative jump
- rel -= 2;
- if (SIGNED_FIT8(rel)) {
- asm_x64_write_byte_2(as, OPCODE_JMP_REL8, rel & 0xff);
- } else {
- rel += 2;
- goto large_jump;
- }
+static int get_label_dest(asm_x64_t *as, int label) {
+ assert(label < as->max_num_labels);
+ return as->label_offsets[label];
+}
+
+void asm_x64_jmp_label(asm_x64_t *as, int label) {
+ int dest = get_label_dest(as, label);
+ int rel = dest - as->code_offset;
+ if (dest >= 0 && rel < 0) {
+ // is a backwards jump, so we know the size of the jump on the first pass
+ // calculate rel assuming 8 bit relative jump
+ rel -= 2;
+ if (SIGNED_FIT8(rel)) {
+ asm_x64_write_byte_2(as, OPCODE_JMP_REL8, rel & 0xff);
} else {
- // is a forwards jump, so need to assume it's large
- large_jump:
- rel -= 5;
- asm_x64_write_byte_1(as, OPCODE_JMP_REL32);
- asm_x64_write_word32(as, rel);
+ rel += 2;
+ goto large_jump;
}
+ } else {
+ // is a forwards jump, so need to assume it's large
+ large_jump:
+ rel -= 5;
+ asm_x64_write_byte_1(as, OPCODE_JMP_REL32);
+ asm_x64_write_word32(as, rel);
}
}
-void asm_x64_jcc_label(asm_x64_t* as, int jcc_type, int label) {
- if (as->pass > ASM_X64_PASS_1) {
- int dest = as->label_offsets[label];
- int rel = dest - as->code_offset;
- if (dest >= 0 && rel < 0) {
- // is a backwards jump, so we know the size of the jump on the first pass
- // calculate rel assuming 8 bit relative jump
- rel -= 2;
- if (SIGNED_FIT8(rel)) {
- asm_x64_write_byte_2(as, OPCODE_JCC_REL8 | jcc_type, rel & 0xff);
- } else {
- rel += 2;
- goto large_jump;
- }
+void asm_x64_jcc_label(asm_x64_t *as, int jcc_type, int label) {
+ int dest = get_label_dest(as, label);
+ int rel = dest - as->code_offset;
+ if (dest >= 0 && rel < 0) {
+ // is a backwards jump, so we know the size of the jump on the first pass
+ // calculate rel assuming 8 bit relative jump
+ rel -= 2;
+ if (SIGNED_FIT8(rel)) {
+ asm_x64_write_byte_2(as, OPCODE_JCC_REL8 | jcc_type, rel & 0xff);
} else {
- // is a forwards jump, so need to assume it's large
- large_jump:
- rel -= 6;
- asm_x64_write_byte_2(as, OPCODE_JCC_REL32_A, OPCODE_JCC_REL32_B | jcc_type);
- asm_x64_write_word32(as, rel);
+ rel += 2;
+ goto large_jump;
}
+ } else {
+ // is a forwards jump, so need to assume it's large
+ large_jump:
+ rel -= 6;
+ asm_x64_write_byte_2(as, OPCODE_JCC_REL32_A, OPCODE_JCC_REL32_B | jcc_type);
+ asm_x64_write_word32(as, rel);
}
}
diff --git a/py/asmx64.h b/py/asmx64.h
index 34d5a4835..addf6bc28 100644
--- a/py/asmx64.h
+++ b/py/asmx64.h
@@ -59,7 +59,6 @@ void asm_x64_cmp_disp_with_r32(asm_x64_t* as, int src_r32_a, int src_disp_a, int
void asm_x64_cmp_i32_with_r32(asm_x64_t* as, int src_i32, int src_r32);
void asm_x64_test_r8_with_r8(asm_x64_t* as, int src_r64_a, int src_r64_b);
void asm_x64_setcc_r8(asm_x64_t* as, int jcc_type, int dest_r8);
-int asm_x64_label_new(asm_x64_t* as);
void asm_x64_label_assign(asm_x64_t* as, int label);
void asm_x64_jmp_label(asm_x64_t* as, int label);
void asm_x64_jcc_label(asm_x64_t* as, int jcc_type, int label);
diff --git a/py/compile.c b/py/compile.c
index c6b195ede..b839ac551 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -2523,8 +2523,8 @@ void py_compile(py_parse_node_t pn) {
}
//emit_cpython_new(&comp->emit, &comp->emit_method_table, comp->max_num_labels);
- emit_bc_new(&comp->emit, &comp->emit_method_table, comp->max_num_labels);
- //emit_new_x64(&comp->emit, &comp->emit_method_table, comp->max_num_labels);
+ //emit_bc_new(&comp->emit, &comp->emit_method_table, comp->max_num_labels);
+ emit_x64_new(&comp->emit, &comp->emit_method_table, comp->max_num_labels);
for (scope_t *s = comp->scope_head; s != NULL; s = s->next) {
compile_scope(comp, s, PASS_2);
diff --git a/py/emit.h b/py/emit.h
index b2d451efd..e995597af 100644
--- a/py/emit.h
+++ b/py/emit.h
@@ -24,7 +24,6 @@ typedef struct _emit_method_table_t {
int (*get_stack_size)(emit_t *emit);
void (*set_stack_size)(emit_t *emit, int size);
- int (*label_new)(emit_t *emit);
void (*label_assign)(emit_t *emit, int l);
void (*import_name)(emit_t *emit, qstr qstr);
void (*import_from)(emit_t *emit, qstr qstr);
diff --git a/py/emitbc.c b/py/emitbc.c
index fae394bd9..eeeb2b749 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -158,10 +158,6 @@ static void emit_pre(emit_t *emit, int stack_size_delta) {
emit->last_emit_was_return_value = false;
}
-static int emit_bc_label_new(emit_t *emit) {
- return emit->next_label++;
-}
-
static void emit_bc_label_assign(emit_t *emit, int l) {
emit_pre(emit, 0);
assert(l < emit->max_num_labels);
@@ -669,7 +665,6 @@ static const emit_method_table_t emit_bc_method_table = {
emit_bc_get_stack_size,
emit_bc_set_stack_size,
- emit_bc_label_new,
emit_bc_label_assign,
emit_bc_import_name,
emit_bc_import_from,
diff --git a/py/emitcpy.c b/py/emitcpy.c
index 72f4d4daa..c3dc20496 100644
--- a/py/emitcpy.c
+++ b/py/emitcpy.c
@@ -79,10 +79,6 @@ static void emit_pre(emit_t *emit, int stack_size_delta, int byte_code_size) {
emit->byte_code_offset += byte_code_size;
}
-static int emit_cpy_label_new(emit_t *emit) {
- return emit->next_label++;
-}
-
static void emit_cpy_label_assign(emit_t *emit, int l) {
emit_pre(emit, 0, 0);
assert(l < emit->max_num_labels);
@@ -822,7 +818,6 @@ static const emit_method_table_t emit_cpy_method_table = {
emit_cpy_get_stack_size,
emit_cpy_set_stack_size,
- emit_cpy_label_new,
emit_cpy_label_assign,
emit_cpy_import_name,
emit_cpy_import_from,
diff --git a/py/emitx64.c b/py/emitx64.c
index c9307dc00..72a085293 100644
--- a/py/emitx64.c
+++ b/py/emitx64.c
@@ -249,10 +249,6 @@ static void emit_call_with_i64_arg(emit_t *emit, void *fun, int64_t arg_val, int
asm_x64_call_ind(emit->as, fun, REG_RAX);
}
-static int emit_x64_label_new(emit_t *emit) {
- return asm_x64_label_new(emit->as);
-}
-
static void emit_x64_label_assign(emit_t *emit, int l) {
asm_x64_label_assign(emit->as, l);
}
@@ -675,7 +671,6 @@ static const emit_method_table_t emit_x64_method_table = {
emit_x64_get_stack_size,
emit_x64_set_stack_size,
- emit_x64_label_new,
emit_x64_label_assign,
emit_x64_import_name,
emit_x64_import_from,
--
GitLab