commit c5b775048746f647cabb399e8ff82661b8ec35d5
parent 8494f427c99de816ae32ecc6494bb24c00db86dd
Author: William Djupström <william@deepztream.com>
Date: Sun, 27 Sep 2026 15:20:52 +0200
Add support for variables and constants
Diffstat:
5 files changed, 172 insertions(+), 9 deletions(-)
diff --git a/src/backend.h b/src/backend.h
@@ -172,7 +172,8 @@ typedef struct {
typedef struct {
Sv name;
- Ir_data default_value;
+ Ir_type type;
+ Ir_arg default_value;
} Ir_static_data;
typedef struct {
@@ -220,7 +221,8 @@ typedef struct {
struct Ir_program {
Ir_function_list functions;
- Ir_static_data_list data;
+ Ir_static_data_list const_data;
+ Ir_static_data_list variable_data;
Ir_extern_list externs;
};
diff --git a/src/lexer.c b/src/lexer.c
@@ -37,6 +37,8 @@ sb_append_token_kind(Sb *sb, Token_kind kind)
else if (kind == T_INVALID) sb_append_cstr(sb, "T_INVALID");
else if (kind == T_WHITESPACE) sb_append_cstr(sb, "T_WHITESPACE");
else if (kind == T_WHITESPACE_NL) sb_append_cstr(sb, "T_WHITESPACE_NL");
+ else if (kind == T_CONST_SYMBOL) sb_append_cstr(sb, "T_CONST_SYMBOL");
+ else if (kind == T_VARIABLE_SYMBOL) sb_append_cstr(sb, "T_VARIABLE_SYMBOL");
else if (kind == T_FUNCTION_SYMBOL) sb_append_cstr(sb, "T_FUNCTION_SYMBOL");
else if (kind == T_LABEL) sb_append_cstr(sb, "T_LABEL");
else if (kind == T_TEMP) sb_append_cstr(sb, "T_TEMP");
@@ -399,6 +401,28 @@ next_token(Lexer *lexer)
c = next_char(lexer);
+ if (c == '!' && is_ident_char(peek_char(lexer))) {
+ result.sv.data++;
+ len = 0;
+ while (next_char_if(lexer, is_ident_char) >= 0) len++;
+ assert(len > 0);
+ result.sv.count = len;
+ result.kind = T_CONST_SYMBOL;
+ lexer->last_tok = result;
+ return result;
+ }
+
+ if (c == '?' && is_ident_char(peek_char(lexer))) {
+ result.sv.data++;
+ len = 0;
+ while (next_char_if(lexer, is_ident_char) >= 0) len++;
+ assert(len > 0);
+ result.sv.count = len;
+ result.kind = T_VARIABLE_SYMBOL;
+ lexer->last_tok = result;
+ return result;
+ }
+
if (c == '$' && is_ident_char(peek_char(lexer))) {
result.sv.data++;
len = 0;
diff --git a/src/lexer.h b/src/lexer.h
@@ -19,6 +19,8 @@ typedef enum {
T_SQ_STRING,
T_DQ_STRING,
T_ARROW,
+ T_CONST_SYMBOL,
+ T_VARIABLE_SYMBOL,
T_FUNCTION_SYMBOL,
T_LABEL,
T_TEMP,
diff --git a/src/parse.c b/src/parse.c
@@ -56,11 +56,17 @@ bool
parse_ir_extern(Ir_program *out_prog, Lexer *lexer)
{
skip_whitespace(lexer);
- if (!expect_token_kind(lexer, T_FUNCTION_SYMBOL)) {
+ Token peek = peek_token(lexer);
+ if (peek.kind != T_CONST_SYMBOL && peek.kind != T_VARIABLE_SYMBOL && peek.kind != T_FUNCTION_SYMBOL) {
+ print_loc(peek.loc);
+ fprintf(stderr, "Error: Expected a constant, variable, or function name following extern\n");
return false;
}
+ next_token(lexer);
da_append(&out_prog->externs, ((Ir_extern) { .symbol = lexer->last_tok.sv }));
- expect_end_statement(lexer);
+ if (!expect_end_statement(lexer)) {
+ return false;
+ }
return true;
}
@@ -501,6 +507,56 @@ parse_ir_function(Ir_program *out_prog, Lexer *lexer)
}
bool
+parse_ir_const(Ir_program *out_prog, Lexer *lexer)
+{
+ Ir_static_data const_ = { .name = lexer->last_tok.sv };
+
+ skip_whitespace(lexer);
+ if (!expect_token_kind(lexer, '=')) {
+ return false;
+ }
+ skip_whitespace(lexer);
+ if (!parse_ir_type(&const_.type, lexer)) {
+ return false;
+ }
+ skip_whitespace(lexer);
+ if (!parse_ir_value(&const_.default_value, lexer)) {
+ return false;
+ }
+ if (const_.default_value.kind == ARG_TEMP_STORAGE) {
+ fprintf(stderr, "Error: Cannot assign a const to a temporary\n");
+ return false;
+ }
+ da_append(&out_prog->const_data, const_);
+ return true;
+}
+
+bool
+parse_ir_variable(Ir_program *out_prog, Lexer *lexer)
+{
+ Ir_static_data var = { .name = lexer->last_tok.sv };
+
+ skip_whitespace(lexer);
+ if (!expect_token_kind(lexer, '=')) {
+ return false;
+ }
+ skip_whitespace(lexer);
+ if (!parse_ir_type(&var.type, lexer)) {
+ return false;
+ }
+ skip_whitespace(lexer);
+ if (!parse_ir_value(&var.default_value, lexer)) {
+ return false;
+ }
+ if (var.default_value.kind == ARG_TEMP_STORAGE) {
+ fprintf(stderr, "Error: Cannot assign a static variable to a temporary\n");
+ return false;
+ }
+ da_append(&out_prog->variable_data, var);
+ return true;
+}
+
+bool
parse_ir_top(Ir_program *out_prog, Lexer *lexer)
{
while (peek_token(lexer).kind != T_EOF) {
@@ -509,6 +565,14 @@ parse_ir_top(Ir_program *out_prog, Lexer *lexer)
if (!parse_ir_extern(out_prog, lexer)) {
return false;
}
+ } else if (t.kind == T_CONST_SYMBOL) {
+ if (!parse_ir_const(out_prog, lexer)) {
+ return false;
+ }
+ } else if (t.kind == T_VARIABLE_SYMBOL) {
+ if (!parse_ir_variable(out_prog, lexer)) {
+ return false;
+ }
} else if (t.kind == T_FUNCTION_SYMBOL) {
if (!parse_ir_function(out_prog, lexer)) {
return false;
diff --git a/src/x86_64-codegen.c b/src/x86_64-codegen.c
@@ -340,6 +340,7 @@ typedef struct {
void *ptr;
size_t length;
size_t alignment;
+ Sv name;
} x86_64_Data;
typedef struct {
@@ -363,6 +364,54 @@ x86_64_add_cstr_from_sv(x86_64_Data_list *data_list, Sv sv)
return data_list->count - 1;
}
+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);
+ void *ptr = malloc(8);
+ x86_64_Data x86_64_data = { .name = data.name, .ptr = ptr, .read_only = read_only };
+ switch (data.type) {
+ case TYPE_I8:
+ x86_64_data.alignment = 1;
+ x86_64_data.length = 1;
+ *(int8_t *) ptr = data.default_value.i64;
+ break;
+ case TYPE_I16:
+ x86_64_data.alignment = 2;
+ x86_64_data.length = 2;
+ *(int16_t *) ptr = data.default_value.i64;
+ break;
+ case TYPE_I32:
+ x86_64_data.alignment = 4;
+ x86_64_data.length = 4;
+ *(int32_t *) ptr = data.default_value.i64;
+ break;
+ case TYPE_PTR:
+ case TYPE_I64:
+ x86_64_data.alignment = 8;
+ x86_64_data.length = 8;
+ *(int64_t *) ptr = data.default_value.i64;
+ break;
+ case TYPE_F32:
+ todo("f32");
+ case TYPE_F64:
+ todo("f64");
+ case TYPE_VOID:
+ fprintf(stderr, "Error: void type not allowed for static data\n");
+ return false;
+ case TYPE_UNKNOWN:
+ unreachable("unknown data type");
+ default:
+ unreachable("data type");
+ }
+ if (!read_only && !data.default_value.i64) {
+ free(ptr);
+ x86_64_data.ptr = NULL;
+ }
+ da_append(data_list, x86_64_data);
+ return true;
+}
+
typedef struct {
x86_64_Function_list functions;
x86_64_Data_list static_data;
@@ -388,7 +437,7 @@ void
x86_64_emit_data_header(x86_64_Program prog, Sb *sb)
{
(void) prog;
- sb_printf(sb, "\n; Static data ;\n");
+ sb_printf(sb, "\n; Static data storage ;\n");
}
void
@@ -1106,8 +1155,16 @@ x86_64_emit_data(x86_64_Data data, Sb *sb, size_t label_id)
sb_printf(sb, "ALIGN %zu\n", data.alignment);
}
if (data.ptr) {
- sb_printf(sb, "SECTION .rodata\n");
- prefix_len = sb_printf(sb, "@%zu: db ", label_id);
+ if (data.read_only) {
+ sb_printf(sb, "SECTION .rodata\n");
+ } else {
+ sb_printf(sb, "SECTION .data\n");
+ }
+ if (data.name.count) {
+ prefix_len = sb_printf(sb, "@%.*s: db ", (int) data.name.count, data.name.items);
+ } else {
+ prefix_len = sb_printf(sb, "@%zu: db ", label_id);
+ }
for (i = 0; i < data.length; i++) {
if (i) {
da_append(sb, ',');
@@ -1122,8 +1179,12 @@ x86_64_emit_data(x86_64_Data data, Sb *sb, size_t label_id)
}
da_append(sb, '\n');
} else {
- sb_printf(sb, "SECTION .bss\n");
- sb_printf(sb, "@%zu: resb %zu", label_id, data.length);
+ 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);
+ } else {
+ sb_printf(sb, "@%zu: resb %zu\n", label_id, data.length);
+ }
}
return true;
}
@@ -2282,6 +2343,16 @@ x86_64_compile_program(Ir_program prog, x86_64_Program *out_prog)
bool success = true;
size_t i;
x86_64_Function func = {0};
+ for (i = 0; i < prog.const_data.count; i++) {
+ if (!x86_64_add_static_data(&out_prog->static_data, prog.const_data.items[i], true)) {
+ success = false;
+ }
+ }
+ for (i = 0; i < prog.variable_data.count; i++) {
+ if (!x86_64_add_static_data(&out_prog->static_data, prog.variable_data.items[i], false)) {
+ success = false;
+ }
+ }
for (i = 0; i < prog.functions.count; i++) {
func = (x86_64_Function) { .name = prog.functions.items[i].name };
if (!x86_64_compile_function(prog.functions.items[i], &func, &out_prog->static_data)) {