commit 7534784930cc8f4c00d131c053159f13f2189316
parent a36698a857973e5e3095781281cf59d34af77c03
Author: William Djupström <william@deepztream.com>
Date: Tue, 29 Sep 2026 20:23:08 +0200
Support caller and callee saved registers
Diffstat:
3 files changed, 124 insertions(+), 54 deletions(-)
diff --git a/src/lexer.c b/src/lexer.c
@@ -406,8 +406,8 @@ next_token(Lexer *lexer)
c = next_char(lexer);
if (c == '!' && is_ident_char(peek_char(lexer))) {
- result.sv.data++;
- len = 0;
+ /* result.sv.data++; */
+ /* len = 0; */
while (next_char_if(lexer, is_ident_char) >= 0) len++;
assert(len > 0);
result.sv.count = len;
@@ -417,8 +417,8 @@ next_token(Lexer *lexer)
}
if (c == '?' && is_ident_char(peek_char(lexer))) {
- result.sv.data++;
- len = 0;
+ /* result.sv.data++; */
+ /* len = 0; */
while (next_char_if(lexer, is_ident_char) >= 0) len++;
assert(len > 0);
result.sv.count = len;
diff --git a/src/parse.c b/src/parse.c
@@ -514,6 +514,21 @@ parse_ir_function(Ir_program *out_prog, Lexer *lexer)
return false;
}
skip_whitespace(lexer);
+ if (peek_token(lexer).kind != ')') {
+ for (;;) {
+ Ir_type type = {0};
+ if (!parse_ir_type(&type, lexer)) {
+ return false;
+ }
+ da_append(&func.argument_types, type);
+ skip_whitespace(lexer);
+ if (peek_token(lexer).kind != ',') {
+ break;
+ }
+ next_token(lexer);
+ skip_whitespace(lexer);
+ }
+ }
if (!expect_token_kind(lexer, ')')) {
return false;
}
diff --git a/src/x86_64-codegen.c b/src/x86_64-codegen.c
@@ -160,6 +160,11 @@ int8_t x86_64_registers_syscall[6] = {
7, 6, 2, 10, 8, 9,
};
+bool x86_64_registers_caller_save[16] = {
+ true, true, true, false, false, false, true, true,
+ true, true, true, true, false, false, false, false
+};
+
int
x86_64_bit_width_of_type(Ir_type type)
{
@@ -222,7 +227,7 @@ x86_64_operand_to_cstr(x86_64_Operand rand)
free(leak_buf);
len = rand.mem.offset.name.count + 5;
leak_buf = malloc(len);
- len = snprintf(leak_buf, len, "[@%.*s]", (int) rand.mem.offset.name.count, rand.mem.offset.name.items);
+ len = snprintf(leak_buf, len, "[%.*s]", (int) rand.mem.offset.name.count, rand.mem.offset.name.items);
break;
case x86_64_MEM_B:
todo_p("MEM_B");
@@ -337,6 +342,7 @@ typedef struct {
typedef struct {
Sv name;
size_t temporary_count;
+ int *mappings;
x86_64_Basic_block_list blocks;
} x86_64_Function;
@@ -380,8 +386,15 @@ bool
x86_64_add_static_data(x86_64_Data_list *data_list, Ir_static_data data, bool read_only)
{
assert(data.default_value.kind == ARG_INT_LITERAL);
+ size_t i;
void *ptr = malloc(8);
- x86_64_Data x86_64_data = { .name = data.name, .ptr = ptr, .read_only = read_only };
+ x86_64_Data x86_64_data = { .name = { .data = data.name.data + 1, .count = data.name.count - 1 }, .ptr = ptr, .read_only = read_only };
+ for (i = 0; i < data_list->count; i++) {
+ if (sv_equal(x86_64_data.name, data_list->items[i].name)) {
+ fprintf(stderr, "Error: symbol `%.*s` already defined\n", (int) x86_64_data.name.count, x86_64_data.name.items);
+ return false;
+ }
+ }
switch (data.type) {
case TYPE_I8:
x86_64_data.alignment = 1;
@@ -1166,15 +1179,39 @@ x86_64_compile_function(Ir_function func, x86_64_Function *out_func, x86_64_Data
{
bool success = true;
size_t i;
- x86_64_Basic_block block;
+ int bit_width;
+ x86_64_Basic_block block = {0};
+ for (i = 0; i < func.argument_types.count; i++) {
+ bit_width = x86_64_bit_width_of_type(func.argument_types.items[i]);
+ da_append(&block.instructions, ((x86_64_Instruction) {
+ .opcode = x86_64_MOV,
+ .encoding = x86_64_RR,
+ .rand1 = {
+ .kind = x86_64_RAND_REGISTER,
+ .bit_width = bit_width,
+ .reg = {
+ .physical = -1,
+ .temp_id = i,
+ },
+ },
+ .rand2 = {
+ .kind = x86_64_RAND_REGISTER,
+ .bit_width = bit_width,
+ .reg = {
+ .physical = x86_64_registers_ccall[i],
+ .temp_id = SIZE_T_INVALID,
+ },
+ },
+ }));
+ }
for (i = 0; i < func.body.count; i++) {
- block = (x86_64_Basic_block) {0};
if (!x86_64_compile_basic_block(func.body.items[i], &block, data_list)) {
da_append(&out_func->blocks, block);
success = false;
break;
}
da_append(&out_func->blocks, block);
+ block = (x86_64_Basic_block) {0};
}
return success;
}
@@ -1183,10 +1220,27 @@ bool
x86_64_emit_function(x86_64_Function fn, Sb *sb)
{
bool success = true;
- size_t i;
+ size_t i, j;
+ struct {
+ int *items;
+ size_t count;
+ size_t capacity;
+ } saved = {0};
sb_printf(sb, "\nGLOBAL %.*s\n", (int) fn.name.count, fn.name.items);
sb_printf(sb, "%.*s:\n", (int) fn.name.count, fn.name.items);
sb_printf(sb, " push rbp\n");
+ for (i = 0; i < 16; i++) {
+ if (x86_64_registers_caller_save[i]) {
+ continue;
+ }
+ for (j = 0; j < fn.temporary_count; j++) {
+ if (fn.mappings[j] == (int) i) {
+ sb_printf(sb, " push %s\n", x86_64_registers_64[i]);
+ da_append(&saved, i);
+ break;
+ }
+ }
+ }
sb_printf(sb, " mov rbp, rsp\n");
sb_printf(sb, " sub rsp, %zu\n", ((fn.temporary_count * 8) + 0xF) & ~0xF);
@@ -1201,10 +1255,16 @@ x86_64_emit_function(x86_64_Function fn, Sb *sb)
sb_append_sv(sb, sv_from_sb(body));
sb_printf(sb, " .ret:\n");
sb_printf(sb, " mov rsp, rbp\n");
+ for (i = saved.count; i; i--) {
+ sb_printf(sb, " pop %s\n", x86_64_registers_64[saved.items[i - 1]]);
+ }
sb_printf(sb, " pop rbp\n");
sb_printf(sb, " ret\n");
free(body.items);
+ if (saved.capacity) {
+ free(saved.items);
+ }
return success;
}
@@ -1224,7 +1284,7 @@ x86_64_emit_data(x86_64_Data data, Sb *sb, size_t label_id)
sb_printf(sb, "SECTION .data\n");
}
if (data.name.count) {
- prefix_len = sb_printf(sb, "@%.*s: db ", (int) data.name.count, data.name.items);
+ prefix_len = sb_printf(sb, "%.*s: db ", (int) data.name.count, data.name.items);
} else {
prefix_len = sb_printf(sb, "@%zu: db ", label_id);
}
@@ -1244,7 +1304,7 @@ x86_64_emit_data(x86_64_Data data, Sb *sb, size_t label_id)
} else {
sb_printf(sb, "SECTION .bss\n");
if (data.name.count) {
- sb_printf(sb, "@%.*s: resb %zu\n", (int) data.name.count, data.name.items, data.length);
+ sb_printf(sb, "%.*s: resb %zu\n", (int) data.name.count, data.name.items, data.length);
} else {
sb_printf(sb, "@%zu: resb %zu\n", label_id, data.length);
}
@@ -1827,49 +1887,43 @@ x86_64_expand_pseudo_instructions(x86_64_Function *fn)
continue;
}
saved.count = 0;
- for (k = 0; k < ins->call_args.count; k++) {
- arg = &ins->call_args.items[k];
- switch (arg->kind) {
- case x86_64_RAND_REGISTER:
- for (l = 0; l < block->live.count; l++) {
- if (block->live.items[l].temp_id == arg->reg.temp_id) {
- break;
- }
- }
- assert(l < block->live.count);
- if (block->live.items[l].end == (long) j || (-block->live.items[l].end - 2) == (long) j) {
- continue;
- }
- da_append(&saved, *arg);
- da_append(&new_instruction_list, ((x86_64_Instruction) {
- .opcode = x86_64_MOV,
- .encoding = x86_64_MR,
- .rand1 = {
- .kind = x86_64_RAND_MEMORY,
- .mem = {
- .encoding = x86_64_MEM_BD,
- .base = {
- .physical = 5,
- .temp_id = SIZE_T_INVALID,
- },
- .offset_bit_width = 8,
- .offset = {
- .kind = x86_64_IMM_LITERAL,
- .i64 = -(saved.count << 3),
- },
- },
- },
- .rand2 = *arg,
- }));
- break;
- case x86_64_RAND_MEMORY:
- todo("memory");
- case x86_64_RAND_IMMEDIATE:
- case x86_64_RAND_SYMBOL:
- continue;
- default:
- unreachable("operand kind");
+ for (k = 0; k < block->live.count; k++) {
+ x86_64_Liveness_entry *live = &block->live.items[k];
+ if (live->start >= (long) j || (live->end >= 0 && live->end <= (long) j)) {
+ continue;
+ }
+ if (!x86_64_registers_caller_save[fn->mappings[live->temp_id]]) {
+ continue;
}
+ x86_64_Operand arg = {
+ .kind = x86_64_RAND_REGISTER,
+ .bit_width = 64,
+ .reg = {
+ .physical = fn->mappings[live->temp_id],
+ .temp_id = live->temp_id,
+ },
+ };
+ da_append(&saved, arg);
+ da_append(&new_instruction_list, ((x86_64_Instruction) {
+ .opcode = x86_64_MOV,
+ .encoding = x86_64_MR,
+ .rand1 = {
+ .kind = x86_64_RAND_MEMORY,
+ .mem = {
+ .encoding = x86_64_MEM_BD,
+ .base = {
+ .physical = 5,
+ .temp_id = SIZE_T_INVALID,
+ },
+ .offset_bit_width = 8,
+ .offset = {
+ .kind = x86_64_IMM_LITERAL,
+ .i64 = -(saved.count << 3),
+ },
+ },
+ },
+ .rand2 = arg,
+ }));
}
struct {
int8_t *items;
@@ -2375,7 +2429,8 @@ x86_64_assign_registers(x86_64_Function *fn)
x86_64_emit_temp_interference_graph_dotfmt(graph, temp_count);
x86_64_emit_temp_colored_graph_dotfmt(graph, mappings, temp_count);
free(graph);
- free(mappings);
+ /* free(mappings); */
+ fn->mappings = mappings;
return true;
}