Replace the bytecode structure with KaosIR

Author: mertyildiran

compiler/compiler.c

@@ -27,56 +27,78 @@
 #include "../vm/cpu.h"
 #include "../interpreter/module_new.h"
 
-typedef struct i64_array i64_array;
+typedef struct KaosIR KaosIR;
+typedef struct KaosInst KaosInst;
+typedef struct KaosOp KaosOp;
 
-typedef struct i64_array {
-    i64* arr;
+typedef struct KaosIR {
+    KaosInst* arr;
     i64 capacity;
     i64 size;
-    i64 heap;
-    i64 start;
     i64 hlt_count;
-    i64_array* ast_ref;
-} i64_array;
+} KaosIR;
 
-i64_array* compile(ASTRoot* ast_root);
+typedef struct KaosInst {
+    i64 op_code;
+    KaosOp* op1;
+    KaosOp* op2;
+    KaosOp* op3;
+    void* ast_ref;
+} KaosInst;
+
+
+enum IRType { IR_REG, IR_VAL };
+enum IRValueType { IR_INT, IR_FLOAT, IR_STRING };
+
+typedef struct KaosOp {
+    enum IRType type;
+    i64 reg;
+    enum IRValueType value_type;
+    union IRValue {
+        i64 i;
+        f64 f;
+        byte *s;
+    } value;
+} KaosOp;
+
+KaosIR* compile(ASTRoot* ast_root);
 void initCallJumps();
-void fillCallJumps(i64_array* program);
-void compileImports(ASTRoot* ast_root, i64_array* program);
-void compileStmtList(i64_array* program, StmtList* stmt_list);
-void compileStmt(i64_array* program, Stmt* stmt);
-unsigned short compileExpr(i64_array* program, Expr* expr);
-void compileDecl(i64_array* program, Decl* decl);
-void compileSpecList(i64_array* program, SpecList* spec_list);
-unsigned short compileSpec(i64_array* program, Spec* spec);
-
-void push_instr(i64_array* program, i64 el);
-void pushProgram(i64_array* program, i64 el);
-i64 popProgram(i64_array* program);
-void freeProgram(i64_array* program);
-i64_array* initProgram();
-void shift_registers(i64_array* program, size_t shift);
-
-Symbol* store_bool(i64_array* program, char *name, bool is_any);
-Symbol* store_int(i64_array* program, char *name, bool is_any);
-Symbol* store_float(i64_array* program, char *name, bool is_any);
-Symbol* store_string(i64_array* program, char *name, size_t len, bool is_any, bool is_dynamic);
-Symbol* store_list(i64_array* program, char *name, size_t len, bool is_dynamic);
-Symbol* store_dict(i64_array* program, char *name, size_t len, bool is_dynamic);
-Symbol* store_any(i64_array* program, char *name);
-
-void load_bool(i64_array* program, Symbol* symbol);
-void load_int(i64_array* program, Symbol* symbol);
-void load_float(i64_array* program, Symbol* symbol);
-void load_string(i64_array* program, Symbol* symbol);
-void load_list(i64_array* program, Symbol* symbol);
-void load_dict(i64_array* program, Symbol* symbol);
-void load_any(i64_array* program, Symbol* symbol);
+void fillCallJumps(KaosIR* program);
+void compileImports(ASTRoot* ast_root, KaosIR* program);
+void compileStmtList(KaosIR* program, StmtList* stmt_list);
+void compileStmt(KaosIR* program, Stmt* stmt);
+unsigned short compileExpr(KaosIR* program, Expr* expr);
+void compileDecl(KaosIR* program, Decl* decl);
+void compileSpecList(KaosIR* program, SpecList* spec_list);
+unsigned short compileSpec(KaosIR* program, Spec* spec);
+
+void push_instr(KaosIR* program, i64 el);
+void pushProgram(KaosIR* program, i64 el);
+KaosInst popProgram(KaosIR* program);
+void freeProgram(KaosIR* program);
+KaosIR* initProgram();
+void shift_registers(KaosIR* program, size_t shift);
+
+Symbol* store_bool(KaosIR* program, char *name, bool is_any);
+Symbol* store_int(KaosIR* program, char *name, bool is_any);
+Symbol* store_float(KaosIR* program, char *name, bool is_any);
+Symbol* store_string(KaosIR* program, char *name, size_t len, bool is_any, bool is_dynamic);
+Symbol* store_list(KaosIR* program, char *name, size_t len, bool is_dynamic);
+Symbol* store_dict(KaosIR* program, char *name, size_t len, bool is_dynamic);
+Symbol* store_any(KaosIR* program, char *name);
+
+void load_bool(KaosIR* program, Symbol* symbol);
+void load_int(KaosIR* program, Symbol* symbol);
+void load_float(KaosIR* program, Symbol* symbol);
+void load_string(KaosIR* program, Symbol* symbol);
+void load_list(KaosIR* program, Symbol* symbol);
+void load_dict(KaosIR* program, Symbol* symbol);
+void load_any(KaosIR* program, Symbol* symbol);
 
 char* compile_module_selector(Expr* module_selector);
-bool declare_function(Stmt* stmt, File* file, i64_array* program);
-void declare_functions(ASTRoot* ast_root, i64_array* program);
-void compile_functions(ASTRoot* ast_root, i64_array* program);
+bool declare_function(Stmt* stmt, File* file, KaosIR* program);
+void declare_functions(ASTRoot* ast_root, KaosIR* program);
+void compile_functions(ASTRoot* ast_root, KaosIR* program);
 
 void strongly_type(Symbol* symbol_x, Symbol* symbol_y, _Function* function, Expr* expr, enum ValueType value_type);
 void strongly_type_basic_check(unsigned short code, char *str1, char *str2, enum Type type, enum ValueType value_type);

compiler/compiler.h

@@ -22,9 +22,9 @@
 
 #include "compiler_emit.h"
 
-void emit(i64_array* program)
+void emit(KaosIR* program)
 {
-    cpu *c = new_cpu(program->arr, program->heap, 0, program->ast_ref->arr, 0);
+    cpu *c = new_cpu(program, 0);
     print_cpu(c, program->hlt_count);
     free_cpu(c);
 }
@@ -53,9 +53,9 @@ void emitBytecode(cpu *c)
     char str_pc[40];
     char str_inst[40];
 
-    sprintf(str_pc, "%lld", c->pc);
+    sprintf(str_pc, "%lld", c->ic);
 
-	switch (c->inst) {
+	switch (c->inst->op_code) {
     case HLT:
         sprintf(str_inst, "%s", "HLT");
 	}

compiler/compiler_emit.c

@@ -26,7 +26,7 @@
 #include "compiler.h"
 #include "../vm/cpu.h"
 
-void emit(i64_array* program);
+void emit(KaosIR* program);
 void print_cpu(cpu *c, i64 hlt_count);
 void emitBytecode(cpu *c);