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

Register stuff cleanup

Browse Source
This commit is contained in:
Krzosa Karol
2022-06-22 16:16:02 +02:00
parent 1ac066c0b6
commit cd48253e3e
4 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bytecode_codegen.cpp
View File

@@ -40,10 +40,12 @@ compile_to_bc(){
Bc *b = &bc; Bc *b = &bc;
For_Named(pctx->ordered_decls, ast){ For_Named(pctx->ordered_decls, ast){
switch(ast->kind){ switch(ast->kind){
CASE(LAMBDA, Decl){ CASE(LAMBDA, Decl){
unused(node); // node->bytecode_data_position = emit_lambda();
BREAK(); BREAK();
} }
CASE(VAR, Decl){ CASE(VAR, Decl){
node->bytecode_data_position = exp_alloc(&b->memory, node->type->size, AF_ZeroMemory); node->bytecode_data_position = exp_alloc(&b->memory, node->type->size, AF_ZeroMemory);
if(node->expr){ if(node->expr){

55
bytecode_interpreter.cpp
View File

@@ -1,10 +1,14 @@
#define BC_LOG 1
#if BC_LOG
#define bc_log(...) log_info(__VA_ARGS__)
#else
#define bc_log(...)
#endif
// //
// Generated using code_generating_script.py // Generated using code_generating_script.py
// //
enum Operation: S32{ enum Operation: S32{
BC_END_OF_INSTRUCTIONS, BC_END_OF_INSTRUCTIONS,
BC_POP_STACK, BC_POP_STACK,
@@ -142,12 +146,6 @@ union Register{
U8 *pointer; U8 *pointer;
}; };
enum{
REG_STACK_POINTER,
REG_INSTRUCTION_POINTER,
REG_SPECIAL_COUNT,
};
struct Instruction{ struct Instruction{
Operation operation; Operation operation;
S32 index_c; S32 index_c;
@@ -168,8 +166,10 @@ struct Instruction{
// //
struct Bc{ struct Bc{
U32 dis; // @debug_id U32 dis; // @debug_id
U8 *stack_bottom;
U64 *stack_bottom;
U64 *stack_pointer;
Instruction *instruction_pointer;
Array<Register> registers; Array<Register> registers;
Array<Register_Index> used_registers; Array<Register_Index> used_registers;
Array<Register_Index> free_registers; Array<Register_Index> free_registers;
@@ -218,10 +218,6 @@ create_bytecode_interp(){
b.free_registers = array_make<Register_Index>(pctx->heap, 1024); b.free_registers = array_make<Register_Index>(pctx->heap, 1024);
b.used_registers = array_make<Register_Index>(pctx->heap, 1024); b.used_registers = array_make<Register_Index>(pctx->heap, 1024);
for(S32 i = 0; i < REG_SPECIAL_COUNT; i++){
allocate_register(&b);
}
{ {
arena_init(&b.instructions, "Bytecode instructions"_s); arena_init(&b.instructions, "Bytecode instructions"_s);
arena_push_size(&b.instructions, 16); // Commit arena_push_size(&b.instructions, 16); // Commit
@@ -326,47 +322,40 @@ emit_end(Bc *b){
i->operation = BC_END_OF_INSTRUCTIONS; i->operation = BC_END_OF_INSTRUCTIONS;
} }
#define BC_LOG 1
#if BC_LOG
#define bc_log(...) log_info(__VA_ARGS__)
#else
#define bc_log(...)
#endif
function void function void
run_bytecode_interp(Bc *b){ run_bytecode_interp(Bc *b){
// Setup registers // Setup registers
b->registers[REG_INSTRUCTION_POINTER].pointer = b->instructions.memory.data; b->instruction_pointer = (Instruction *)b->instructions.memory.data;
b->registers[REG_STACK_POINTER].pointer = b->stack_bottom = b->stack.memory.data; b->stack_pointer = b->stack_bottom = (U64 *)b->stack.memory.data;
for(;;){ for(;;){
auto instr = (Instruction *)b->registers[REG_INSTRUCTION_POINTER].pointer64; Instruction *instr = b->instruction_pointer++;
bc_log("%llu.[0x%llx] - %s ", instr->di, b->registers[REG_INSTRUCTION_POINTER].pointer64, op_name[instr->operation]); bc_log("i%u[0x%llx] %s ", instr->di, instr, op_name[instr->operation]);
b->registers[REG_INSTRUCTION_POINTER].pointer += sizeof(Instruction);
switch(instr->operation){ switch(instr->operation){
default:{} default:{}
case BC_LOAD_FROM_MEMORY64:{ case BC_LOAD_FROM_MEMORY64:{
U64 *load_address = b->registers[instr->index_a].pointer64; U64 *load_address = b->registers[instr->index_a].pointer64;
b->registers[instr->index_c].u64 = *load_address; b->registers[instr->index_c].u64 = *load_address;
bc_log("r%u(dst) [0x%llx|%lld|%f]", instr->index_c, b->registers[instr->index_c].u64, b->registers[instr->index_c].u64, b->registers[instr->index_c].u64); bc_log("load_address[r%u, %llx] dst[r%u] [0x%llx|%lld|%f]", instr->index_a, load_address, instr->index_c, b->registers[instr->index_c].u64, b->registers[instr->index_c].u64, b->registers[instr->index_c].u64);
}break; }break;
case BC_STORE_TO_MEMORY64:{ case BC_STORE_TO_MEMORY64:{
U64 *store_address = b->registers[instr->index_c].pointer64; U64 *store_address = b->registers[instr->index_c].pointer64;
*store_address = b->registers[instr->index_a].u64; *store_address = b->registers[instr->index_a].u64;
bc_log("r%u(src) [0x%llx|%lld|%f]", instr->index_a, *store_address, *store_address, *store_address); bc_log("src[r%u] store_address[r%u, %llx] value_written[0x%llx|%lld|%f]", instr->index_a, instr->index_c, store_address, *store_address, *store_address, *store_address);
}break; }break;
case BC_PUSH_STACK:{ case BC_PUSH_STACK:{
U64 *stack = b->registers[REG_STACK_POINTER].pointer64++; U64 *stack = b->stack_pointer++;
U64 src = b->registers[instr->index_a].u64; U64 src = b->registers[instr->index_a].u64;
bc_log("r%u(src) [0x%llx|%lld|%f]", instr->index_a, src, src, src); bc_log("r%u(src) [0x%llx|%lld|%f]", instr->index_a, src, src, src);
*stack = src; *stack = src;
}break; }break;
case BC_POP_STACK:{ case BC_POP_STACK:{
U64 *stack = --b->registers[REG_STACK_POINTER].pointer64; U64 *stack = --b->stack_pointer;
bc_log("r%u(dst) [0x%llx|%lld|%f]", instr->index_c, *stack, *stack, *stack); bc_log("r%u(dst) [0x%llx|%lld|%f]", instr->index_c, *stack, *stack, *stack);
b->registers[instr->index_c].u64 = *stack; b->registers[instr->index_c].u64 = *stack;
}break; }break;
@@ -379,10 +368,10 @@ run_bytecode_interp(Bc *b){
b->registers[instr->index_c] = instr->constant; b->registers[instr->index_c] = instr->constant;
#if BC_LOG #if BC_LOG
switch(instr->debug_type_flag){ switch(instr->debug_type_flag){
case TYPE_S64: bc_log("r%u(dst) [%lld]", instr->index_c, instr->constant.s64); break; case TYPE_S64: bc_log("dst[r%u] S64[%lld]", instr->index_c, instr->constant.s64); break;
case TYPE_U64: bc_log("r%u(dst) [%llu]", instr->index_c, instr->constant.u64); break; case TYPE_U64: bc_log("dst[r%u] U64[%llu]", instr->index_c, instr->constant.u64); break;
case TYPE_F64: bc_log("r%u(dst) [%f]" , instr->index_c, instr->constant.f64); break; case TYPE_F64: bc_log("dst[r%u] F64[%f]" , instr->index_c, instr->constant.f64); break;
case TYPE_POINTER: bc_log("r%u(dst) [0x%llx]" , instr->index_c, instr->constant.pointer64); break; case TYPE_POINTER: bc_log("dst[r%u] Pointer[0x%llx]" , instr->index_c, instr->constant.pointer64); break;
invalid_default_case; invalid_default_case;
} }
#endif #endif

7
main.cpp
View File

@@ -178,7 +178,7 @@ int main(int argument_count, char **arguments){
test_intern_table(); test_intern_table();
emit_line_directives = true; emit_line_directives = true;
String program_name = "main.kl"_s; String program_name = "vm.kl"_s;
if(argument_count > 1){ if(argument_count > 1){
program_name = string_from_cstring(arguments[1]); program_name = string_from_cstring(arguments[1]);
} }
@@ -204,13 +204,12 @@ int main(int argument_count, char **arguments){
Ast_Module *module = add_module(0, pctx->intern(program_name)); Ast_Module *module = add_module(0, pctx->intern(program_name));
parse_all_modules(); parse_all_modules();
assert(module); assert(module);
// resolve_everything_in_module(pctx->language_base_module);
resolve_everything_in_module(module); resolve_everything_in_module(module);
arena_clear(&pctx->stage_arena); arena_clear(&pctx->stage_arena);
// compile_to_bc(); compile_to_bc();
// __debugbreak(); __debugbreak();
String result = get_compilation_result(); String result = get_compilation_result();
assert(os_write_file("program.c"_s, result)); assert(os_write_file("program.c"_s, result));
{ {

3
typechecking.cpp
View File

@@ -2,9 +2,6 @@
#define BREAK() } break #define BREAK() } break
function String gen_string_simple_decl(Allocator *a, Ast_Type *ast, String name = {}, Ast_Scope *scope = 0, bool scope_names = true); function String gen_string_simple_decl(Allocator *a, Ast_Type *ast, String name = {}, Ast_Scope *scope = 0, bool scope_names = true);
//-----------------------------------------------------------------------------
// Evaluating constant expressions
//-----------------------------------------------------------------------------
function void function void
typename_base(String_Builder *sb, Ast_Type *type){ typename_base(String_Builder *sb, Ast_Type *type){
switch(type->kind){ switch(type->kind){