krzosa/corelang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small allocator changes, fix crash

Browse Source
This commit is contained in:
Krzosa Karol
2022-12-31 21:05:13 +01:00
parent d75c54f61f
commit d5179bb596
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core_compiler.cpp
View File

@@ -1,19 +1,19 @@
CORE_Static void CORE_Static void
core_init_compiler(Parse_Ctx *ctx, Allocator *allocator) { core_init_compiler(Parse_Ctx *ctx, Arena *perm, Allocator *heap) {
ctx->init_ctx_time_begin = os_time(); ctx->init_ctx_time_begin = os_time();
pctx = ctx; pctx = ctx;
Allocator *heap_allocator = allocator; ctx->perm = perm;
ctx->perm = (Arena *)allocator; ctx->heap = heap;
ctx->type_map = map_make(heap_allocator, 2048); ctx->type_map = map_make(heap, 2048);
ctx->gen = {ctx->perm}; ctx->gen = {ctx->perm};
ctx->helper_builder = {ctx->perm}; ctx->helper_builder = {ctx->perm};
ctx->scope_ids = 1; ctx->scope_ids = 1;
bigint_allocator = ctx->perm; bigint_allocator = ctx->perm;
arena_init(&ctx->stage_arena, "Compiler stage arena"_s); arena_init(&ctx->stage_arena, "Compiler stage arena"_s);
ctx->tokens = array_make<Token>(heap_allocator, 4096 * 4); ctx->tokens = array_make<Token>(heap, 4096 * 4);
ctx->interns = intern_table_make(ctx->perm, heap_allocator, 2048); ctx->interns = intern_table_make(ctx->perm, heap, 2048);
/*#import meta /*#import meta
for i in meta.keywords: for i in meta.keywords:
@@ -96,7 +96,9 @@ core_init_compiler(Parse_Ctx *ctx, Allocator *allocator) {
CORE_Static void CORE_Static void
core_bootstrap_compiler(Allocator *allocator) { core_bootstrap_compiler(Allocator *allocator) {
Parse_Ctx *ctx = allocate_struct(allocator, Parse_Ctx); Parse_Ctx *ctx = allocate_struct(allocator, Parse_Ctx);
core_init_compiler(ctx, allocator);
assert((uintptr_t)allocator->allocate == (uintptr_t)arena_push_size);
core_init_compiler(ctx, (Arena *)allocator, allocator);
} }
CORE_Static void CORE_Static void
@@ -212,8 +214,9 @@ resolve_everything_in_module(Ast_Module *module) {
CORE_Static String CORE_Static String
compile_file_to_string(Arena *arena, String filename) { compile_file_to_string(Arena *arena, String filename) {
pctx->total_time = os_time(); F64 total_time = os_time();
core_bootstrap_compiler(arena); core_bootstrap_compiler(arena);
pctx->total_time = total_time;
{ {
Ast_Module *module = add_module(0, pctx->intern("Language.core"_s)); Ast_Module *module = add_module(0, pctx->intern("Language.core"_s));
{ {

5
core_compiler.h
View File

@@ -22,8 +22,11 @@ struct Lex_Stream{
struct Parse_Ctx{ struct Parse_Ctx{
Arena *perm; // Stores: AST, tokens, interns Arena *perm; // Stores: AST, tokens, interns
Allocator *heap;
Arena stage_arena; Arena stage_arena;
Arena scratch; Arena _scratch;
Arena *scratch;
// Lexer stuff // Lexer stuff
Lex_Stream stream; Lex_Stream stream;