diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/ast-tree.c | 15 | ||||
| -rw-r--r-- | src/compiler/code-generator.c | 585 | ||||
| -rw-r--r-- | src/compiler/code-generator.h | 105 | ||||
| -rw-r--r-- | src/compiler/lexer.c | 5 | ||||
| -rw-r--r-- | src/compiler/parser.c | 1 | ||||
| -rw-r--r-- | src/main.c | 53 |
6 files changed, 21 insertions, 743 deletions
diff --git a/src/compiler/ast-tree.c b/src/compiler/ast-tree.c index 7c520aa..97e06dc 100644 --- a/src/compiler/ast-tree.c +++ b/src/compiler/ast-tree.c @@ -825,6 +825,11 @@ AstTreeRoot *makeAstTree(ParserNode *parsedRoot) { case PARSER_TOKEN_FUNCTION_CALL: case PARSER_TOKEN_IDENTIFIER: case PARSER_TOKEN_OPERATOR_ASSIGN: + case PARSER_TOKEN_OPERATOR_SUM_ASSIGN: + case PARSER_TOKEN_OPERATOR_SUB_ASSIGN: + case PARSER_TOKEN_OPERATOR_MULTIPLY_ASSIGN: + case PARSER_TOKEN_OPERATOR_DIVIDE_ASSIGN: + case PARSER_TOKEN_OPERATOR_MODULO_ASSIGN: case PARSER_TOKEN_OPERATOR_PLUS: case PARSER_TOKEN_OPERATOR_MINUS: case PARSER_TOKEN_OPERATOR_SUM: @@ -1224,6 +1229,11 @@ AstTree *astTreeParseFunction(ParserNode *parserNode, AstTreeHelper *p_helper) { case PARSER_TOKEN_SYMBOL_PARENTHESIS: case PARSER_TOKEN_SYMBOL_COMMA: case PARSER_TOKEN_OPERATOR_ASSIGN: + case PARSER_TOKEN_OPERATOR_SUM_ASSIGN: + case PARSER_TOKEN_OPERATOR_SUB_ASSIGN: + case PARSER_TOKEN_OPERATOR_MULTIPLY_ASSIGN: + case PARSER_TOKEN_OPERATOR_DIVIDE_ASSIGN: + case PARSER_TOKEN_OPERATOR_MODULO_ASSIGN: case PARSER_TOKEN_OPERATOR_PLUS: case PARSER_TOKEN_OPERATOR_MINUS: case PARSER_TOKEN_OPERATOR_SUM: @@ -1704,6 +1714,11 @@ AstTree *astTreeParseCurlyBracket(ParserNode *parserNode, case PARSER_TOKEN_SYMBOL_PARENTHESIS: case PARSER_TOKEN_SYMBOL_COMMA: case PARSER_TOKEN_OPERATOR_ASSIGN: + case PARSER_TOKEN_OPERATOR_SUM_ASSIGN: + case PARSER_TOKEN_OPERATOR_SUB_ASSIGN: + case PARSER_TOKEN_OPERATOR_MULTIPLY_ASSIGN: + case PARSER_TOKEN_OPERATOR_DIVIDE_ASSIGN: + case PARSER_TOKEN_OPERATOR_MODULO_ASSIGN: case PARSER_TOKEN_OPERATOR_PLUS: case PARSER_TOKEN_OPERATOR_MINUS: case PARSER_TOKEN_OPERATOR_SUM: diff --git a/src/compiler/code-generator.c b/src/compiler/code-generator.c deleted file mode 100644 index 0a3938e..0000000 --- a/src/compiler/code-generator.c +++ /dev/null @@ -1,585 +0,0 @@ -#include "code-generator.h" -#include "compiler/ast-tree.h" -#include "utils/log.h" -#include "utils/memory.h" -#include <assert.h> -#include <stdint.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -void codeGeneratorOperandDestroy(CodeGeneratorOperand operand) { - if (operand.isReference) { - free(operand.value.reference); - } -} - -void codeGeneratorDelete(CodeGeneratorCodes *code) { - for (size_t i = 0; i < code->codes_size; ++i) { - CodeGeneratorCode current = code->codes[i]; - switch (current.instruction) { - case CODE_GENERATOR_INSTRUCTION_PRINT_U64: { - CodeGeneratorOperand *metadata = current.metadata; - codeGeneratorOperandDestroy(*metadata); - free(metadata); - } - case CODE_GENERATOR_INSTRUCTION_RET: - continue; - case CODE_GENERATOR_INSTRUCTION_CALL: { - CodeGeneratorCall *metadata = current.metadata; - free(metadata); - } - continue; - case CODE_GENERATOR_INSTRUCTION_MOV: { - CodeGeneratorMov *metadata = current.metadata; - codeGeneratorOperandDestroy(metadata->op0); - codeGeneratorOperandDestroy(metadata->op1); - free(metadata); - } - continue; - case CODE_GENERATOR_INSTRUCTION_FUNCTION_BEGIN: { - CodeGeneratorFunctionBegin *metadata = current.metadata; - free(metadata); - } - continue; - case CODE_GENERATOR_INSTRUCTION_FUNCTION_END: { - CodeGeneratorFunctionEnd *metadata = current.metadata; - free(metadata); - } - continue; - } - UNREACHABLE; - } - for (size_t i = 0; i < code->defines_size; ++i) { - codeGeneratorOperandDestroy(code->defines[i].operand); - } - free(code->codes); - free(code); -} - -CodeGeneratorOperand *newCodeGeneratorOperand(void *value, bool isReference) { - CodeGeneratorOperand *result = a404m_malloc(sizeof(*result)); - - result->isReference = isReference; - if (isReference) { - result->value.reference = value; - } else { - result->value.value = (uint64_t)value; - } - - return result; -} - -CodeGeneratorOperand makeCodeGeneratorOperand(void *value, bool isReference) { - CodeGeneratorOperand result = { - .isReference = isReference, - }; - - if (isReference) { - result.value.reference = value; - } else { - result.value.value = (uint64_t)value; - } - - return result; -} - -CodeGeneratorFunctionBegin *newCodeGeneratorFunctionBegin(char *name_begin, - char *name_end) { - CodeGeneratorFunctionBegin *result = a404m_malloc(sizeof(*result)); - result->name_begin = name_begin; - result->name_end = name_end; - return result; -} - -CodeGeneratorFunctionEnd *newCodeGeneratorFunctionEnd(char *name_begin, - char *name_end) { - CodeGeneratorFunctionEnd *result = a404m_malloc(sizeof(*result)); - result->name_begin = name_begin; - result->name_end = name_end; - return result; -} - -CodeGeneratorOperand *newCodeGeneratorOperandFromAstTree(AstTree tree) { - switch (tree.token) { - case AST_TREE_TOKEN_VALUE_INT: - return newCodeGeneratorOperand((void *)(uint64_t)(AstTreeInt)tree.metadata, - false); - case AST_TREE_TOKEN_VARIABLE: { - AstTreeVariable *variable = tree.metadata; - if (!typeIsEqual(variable->type, &AST_TREE_U64_TYPE)) { - UNREACHABLE; - } - if (variable->isConst) { - return newCodeGeneratorOperand( - (void *)(uint64_t)(AstTreeInt)variable->value->metadata, false); - } else { - char *name = a404m_malloc( - (variable->name_end - variable->name_begin + 1) * sizeof(*name)); - strncpy(name, variable->name_begin, - variable->name_end - variable->name_begin); - name[variable->name_end - variable->name_begin] = '\0'; - - return newCodeGeneratorOperand(name, true); - } - } - case AST_TREE_TOKEN_FUNCTION: - case AST_TREE_TOKEN_KEYWORD_PRINT_U64: - case AST_TREE_TOKEN_TYPE_TYPE: - case AST_TREE_TOKEN_TYPE_FUNCTION: - case AST_TREE_TOKEN_TYPE_VOID: - case AST_TREE_TOKEN_TYPE_U64: - case AST_TREE_TOKEN_FUNCTION_CALL: - case AST_TREE_TOKEN_VARIABLE_DEFINE: - case AST_TREE_TOKEN_OPERATOR_ASSIGN: - case AST_TREE_TOKEN_OPERATOR_SUM: - case AST_TREE_TOKEN_NONE: - } - UNREACHABLE; -} - -CodeGeneratorCode createGenerateCode(char *label_begin, char *label_end, - CodeGeneratorInstruction instruction, - void *metadata) { - CodeGeneratorCode code = { - .label_begin = label_begin, - .label_end = label_end, - .instruction = instruction, - .metadata = metadata, - }; - return code; -} - -CodeGeneratorDefine createGenerateDefine(char *label_begin, char *label_end, - CodeGeneratorOperand operand, - size_t bytes) { - CodeGeneratorDefine define = { - .label_begin = label_begin, - .label_end = label_end, - .operand = operand, - .bytes = bytes, - }; - return define; -} - -CodeGeneratorCode *newGenerateCode(char *label_begin, char *label_end, - CodeGeneratorInstruction instruction) { - CodeGeneratorCode *result = a404m_malloc(sizeof(*result)); - result->label_begin = label_begin; - result->label_end = label_end; - result->instruction = instruction; - return result; -} - -void generateCodePushCode(CodeGeneratorCodes *codes, CodeGeneratorCode code) { - size_t codes_size = - a404m_malloc_usable_size(codes->codes) / sizeof(*codes->codes); - if (codes_size == codes->codes_size) { - codes_size += codes_size / 2 + 1; - codes->codes = - a404m_realloc(codes->codes, codes_size * sizeof(*codes->codes)); - } - codes->codes[codes->codes_size] = code; - codes->codes_size += 1; -} - -void generateCodePushDefine(CodeGeneratorCodes *codes, - CodeGeneratorDefine define) { - size_t defines_size = - a404m_malloc_usable_size(codes->defines) / sizeof(*codes->defines); - if (defines_size == codes->defines_size) { - defines_size += defines_size / 2 + 1; - codes->defines = - a404m_realloc(codes->defines, defines_size * sizeof(*codes->defines)); - } - codes->defines[codes->defines_size] = define; - codes->defines_size += 1; -} - -CodeGeneratorCodes *codeGenerator(AstTreeRoot *astTreeRoot) { - CodeGeneratorCodes *codes = a404m_malloc(sizeof(*codes)); - - codes->codes = a404m_malloc(0); - codes->codes_size = 0; - codes->defines = a404m_malloc(0); - codes->defines_size = 0; - - for (size_t i = 0; i < astTreeRoot->variables.size; ++i) { - AstTreeVariable *variable = astTreeRoot->variables.data[i]; - switch (variable->value->token) { - case AST_TREE_TOKEN_FUNCTION: - if (!codeGeneratorAstTreeFunction(variable->name_begin, - variable->name_end, *variable->value, - codes)) { - return NULL; - } - continue; - case AST_TREE_TOKEN_VALUE_INT: - if (!variable->isConst) { - CodeGeneratorOperand value = makeCodeGeneratorOperand( - (void *)(uint64_t)(AstTreeInt)variable->value->metadata, false); - generateCodePushDefine( - codes, - createGenerateDefine(variable->name_begin, variable->name_end, - value, astTreeTypeSize(*variable->type))); - } - continue; - case AST_TREE_TOKEN_TYPE_TYPE: - case AST_TREE_TOKEN_TYPE_FUNCTION: - case AST_TREE_TOKEN_TYPE_VOID: - case AST_TREE_TOKEN_VARIABLE: - case AST_TREE_TOKEN_KEYWORD_PRINT_U64: - case AST_TREE_TOKEN_FUNCTION_CALL: - case AST_TREE_TOKEN_TYPE_U64: - case AST_TREE_TOKEN_VARIABLE_DEFINE: - case AST_TREE_TOKEN_OPERATOR_ASSIGN: - case AST_TREE_TOKEN_OPERATOR_SUM: - case AST_TREE_TOKEN_NONE: - break; - } - printLog("Bad token %d", variable->value->token); - return NULL; - } - - return codes; -} - -bool codeGeneratorAstTreeFunction(char *name_begin, char *name_end, - AstTree astTree, CodeGeneratorCodes *codes) { - AstTreeFunction *metadata = astTree.metadata; - AstTreeScope scope = metadata->scope; - - generateCodePushCode( - codes, - createGenerateCode(NULL, NULL, CODE_GENERATOR_INSTRUCTION_FUNCTION_BEGIN, - newCodeGeneratorFunctionBegin(name_begin, name_end))); - - for (size_t i = 0; i < scope.expressions_size; ++i) { - AstTree *tree = scope.expressions[i]; - switch (tree->token) { - case AST_TREE_TOKEN_FUNCTION_CALL: { - AstTreeFunctionCall *metadata = tree->metadata; - AstTree *function = metadata->function; - if (metadata->parameters_size != 0) { - printLog("Not implemented"); - exit(0); - } - if (function->token != AST_TREE_TOKEN_VARIABLE) { - printLog("Not implemented"); - exit(0); - } - AstTreeVariable *function_metadata = function->metadata; - CodeGeneratorCall *callMetadata = a404m_malloc(sizeof(*callMetadata)); - callMetadata->label_begin = function_metadata->name_begin; - callMetadata->label_end = function_metadata->name_end; - generateCodePushCode( - codes, createGenerateCode(NULL, NULL, CODE_GENERATOR_INSTRUCTION_CALL, - callMetadata)); - } - goto OK; - case AST_TREE_TOKEN_KEYWORD_PRINT_U64: { - AstTreeSingleChild *metadata = tree->metadata; - if (metadata->token == AST_TREE_TOKEN_VALUE_INT) { - CodeGeneratorOperand *value = newCodeGeneratorOperand( - (void *)(uint64_t)(AstTreeInt)metadata->metadata, false); - generateCodePushCode( - codes, - createGenerateCode(NULL, NULL, CODE_GENERATOR_INSTRUCTION_PRINT_U64, - value)); - } else if (metadata->token == AST_TREE_TOKEN_VARIABLE) { - AstTreeVariable *variable = metadata->metadata; - if (variable->isConst) { - CodeGeneratorOperand *value = newCodeGeneratorOperand( - (void *)(uint64_t)(AstTreeInt)variable->value->metadata, false); - generateCodePushCode( - codes, - createGenerateCode(NULL, NULL, - CODE_GENERATOR_INSTRUCTION_PRINT_U64, value)); - } else { - char *name = a404m_malloc( - (variable->name_end - variable->name_begin + 1) * sizeof(*name)); - strncpy(name, variable->name_begin, - variable->name_end - variable->name_begin); - name[variable->name_end - variable->name_begin] = '\0'; - generateCodePushCode( - codes, createGenerateCode(NULL, NULL, - CODE_GENERATOR_INSTRUCTION_PRINT_U64, - newCodeGeneratorOperand(name, true))); - } - } else { - printLog("Not implemented yet"); - exit(1); - } - } - goto OK; - case AST_TREE_TOKEN_OPERATOR_ASSIGN: { - AstTreeInfix *infix = tree->metadata; - - if (infix->left.token != AST_TREE_TOKEN_VARIABLE) { - printLog("Not implemented yet"); - exit(1); - } - - CodeGeneratorMov *operands = a404m_malloc(sizeof(*operands)); - CodeGeneratorOperand *op0 = - newCodeGeneratorOperandFromAstTree(infix->left); - CodeGeneratorOperand *op1 = - newCodeGeneratorOperandFromAstTree(infix->right); - operands->op0 = *op0; - operands->op1 = *op1; - operands->bytes = astTreeTypeSize(*infix->left.type); - free(op0); - free(op1); - - generateCodePushCode( - codes, createGenerateCode(NULL, NULL, CODE_GENERATOR_INSTRUCTION_MOV, - operands)); - } - goto OK; - case AST_TREE_TOKEN_OPERATOR_SUM: { - AstTreeInfix *infix = tree->metadata; - - if (infix->left.token != AST_TREE_TOKEN_VARIABLE) { - printLog("Not implemented yet"); - exit(1); - } - - CodeGeneratorMov *operands = a404m_malloc(sizeof(*operands)); - CodeGeneratorOperand *op0 = - newCodeGeneratorOperandFromAstTree(infix->left); - CodeGeneratorOperand *op1 = - newCodeGeneratorOperandFromAstTree(infix->right); - operands->op0 = *op0; - operands->op1 = *op1; - operands->bytes = astTreeTypeSize(*infix->left.type); - free(op0); - free(op1); - - generateCodePushCode( - codes, createGenerateCode(NULL, NULL, CODE_GENERATOR_INSTRUCTION_ADD, - operands)); - } - goto OK; - case AST_TREE_TOKEN_VARIABLE_DEFINE: - case AST_TREE_TOKEN_VALUE_INT: - case AST_TREE_TOKEN_VARIABLE: - case AST_TREE_TOKEN_FUNCTION: - case AST_TREE_TOKEN_TYPE_TYPE: - case AST_TREE_TOKEN_TYPE_FUNCTION: - case AST_TREE_TOKEN_TYPE_VOID: - case AST_TREE_TOKEN_TYPE_U64: - case AST_TREE_TOKEN_NONE: - } - printLog("Bad token %d", tree->token); - return false; - OK: - } - - generateCodePushCode( - codes, - createGenerateCode(NULL, NULL, CODE_GENERATOR_INSTRUCTION_FUNCTION_END, - newCodeGeneratorFunctionEnd(name_begin, name_end))); - - /* - generateCodePushCode(codes, createGenerateCode(label_begin, label_end, - CODE_GENERATOR_INSTRUCTION_RET, - NULL)); - */ - - return true; -} - -static const char TEMPLATE[] = "include 'stdlib/main.asm'\n"; -static const size_t TEMPLATE_LEN = - sizeof(TEMPLATE) / sizeof(*TEMPLATE) - sizeof(*TEMPLATE); - -static const char EXEC_SEGMENT[] = "segment readable executable\n"; -static const size_t EXEC_SEGMENT_LEN = - sizeof(EXEC_SEGMENT) / sizeof(*EXEC_SEGMENT) - sizeof(*EXEC_SEGMENT); - -static const char DATA_SEGMENT[] = "segment readable writable\n"; -static const size_t DATA_SEGMENT_LEN = - sizeof(DATA_SEGMENT) / sizeof(*DATA_SEGMENT) - sizeof(*DATA_SEGMENT); - -static void codeGeneratorAppendFlatASMCommand(char **fasm, size_t *fasm_size, - size_t *fasm_inserted, - const char *str, size_t str_len) { - size_t inserted_last = *fasm_inserted; - *fasm_inserted += str_len; - if (*fasm_inserted + 1 >= *fasm_size) { - *fasm_size = *fasm_inserted + *fasm_inserted / 2 + 1; - *fasm = a404m_realloc(*fasm, *fasm_size * sizeof(*fasm)); - } - strncpy(*fasm + inserted_last, str, str_len); -} - -char *codeGeneratorToFlatASM(const CodeGeneratorCodes *codes) { - size_t fasm_size = TEMPLATE_LEN + 1; - char *fasm = a404m_malloc(fasm_size * sizeof(*fasm)); - size_t fasm_inserted = 0; - - codeGeneratorAppendFlatASMCommand(&fasm, &fasm_size, &fasm_inserted, TEMPLATE, - TEMPLATE_LEN); - - codeGeneratorAppendFlatASMCommand(&fasm, &fasm_size, &fasm_inserted, - EXEC_SEGMENT, EXEC_SEGMENT_LEN); - - for (size_t i = 0; i < codes->codes_size; ++i) { - const CodeGeneratorCode code = codes->codes[i]; - if (code.label_begin != code.label_end) { - codeGeneratorAppendFlatASMCommand(&fasm, &fasm_size, &fasm_inserted, - code.label_begin, - code.label_end - code.label_begin); - - codeGeneratorAppendFlatASMCommand(&fasm, &fasm_size, &fasm_inserted, - ":\n", 2); - } - - switch (code.instruction) { - case CODE_GENERATOR_INSTRUCTION_PRINT_U64: { - CodeGeneratorOperand *metadata = code.metadata; - char *inst; - if (metadata->isReference) { - asprintf(&inst, "mov rdi,[%s]\ncall print_u64\n", - metadata->value.reference); - } else { - asprintf(&inst, "mov rdi,%lu\ncall print_u64\n", metadata->value.value); - } - codeGeneratorAppendFlatASMCommand(&fasm, &fasm_size, &fasm_inserted, inst, - strlen(inst)); - free(inst); - } - continue; - case CODE_GENERATOR_INSTRUCTION_CALL: { - CodeGeneratorCall *metadata = code.metadata; - constexpr char CALL_INST[] = "call "; - codeGeneratorAppendFlatASMCommand(&fasm, &fasm_size, &fasm_inserted, - CALL_INST, strlen(CALL_INST)); - codeGeneratorAppendFlatASMCommand( - &fasm, &fasm_size, &fasm_inserted, metadata->label_begin, - metadata->label_end - metadata->label_begin); - codeGeneratorAppendFlatASMCommand(&fasm, &fasm_size, &fasm_inserted, "\n", - 1); - } - continue; - case CODE_GENERATOR_INSTRUCTION_RET: { - constexpr char INST[] = "ret\n"; - codeGeneratorAppendFlatASMCommand(&fasm, &fasm_size, &fasm_inserted, INST, - strlen(INST)); - } - continue; - case CODE_GENERATOR_INSTRUCTION_MOV: { - CodeGeneratorMov *metadata = code.metadata; - char *inst; - if (metadata->op0.isReference) { - asprintf(&inst, "mov%ld [%s],", metadata->bytes * 8, - metadata->op0.value.reference); - } else { - UNREACHABLE; - } - codeGeneratorAppendFlatASMCommand(&fasm, &fasm_size, &fasm_inserted, inst, - strlen(inst)); - free(inst); - if (metadata->op1.isReference) { - asprintf(&inst, "[%s]\n", metadata->op1.value.reference); - } else { - asprintf(&inst, "%lu\n", metadata->op1.value.value); - } - codeGeneratorAppendFlatASMCommand(&fasm, &fasm_size, &fasm_inserted, inst, - strlen(inst)); - free(inst); - } - continue; - case CODE_GENERATOR_INSTRUCTION_FUNCTION_BEGIN: { - CodeGeneratorFunctionBegin *metadata = code.metadata; - char *inst; - asprintf(&inst, "funBegin %.*s\nfunEntry %.*s\n", - (int)(metadata->name_end - metadata->name_begin), - metadata->name_begin, - (int)(metadata->name_end - metadata->name_begin), - metadata->name_begin); - codeGeneratorAppendFlatASMCommand(&fasm, &fasm_size, &fasm_inserted, inst, - strlen(inst)); - free(inst); - } - continue; - case CODE_GENERATOR_INSTRUCTION_FUNCTION_END: { - CodeGeneratorFunctionEnd *metadata = code.metadata; - char *inst; - asprintf(&inst, "funEnd %.*s\n", - (int)(metadata->name_end - metadata->name_begin), - metadata->name_begin); - codeGeneratorAppendFlatASMCommand(&fasm, &fasm_size, &fasm_inserted, inst, - strlen(inst)); - free(inst); - } - continue; - case CODE_GENERATOR_INSTRUCTION_ADD: { - } - } - UNREACHABLE; - } - - codeGeneratorAppendFlatASMCommand(&fasm, &fasm_size, &fasm_inserted, - DATA_SEGMENT, DATA_SEGMENT_LEN); - - for (size_t i = 0; i < codes->defines_size; ++i) { - const CodeGeneratorDefine define = codes->defines[i]; - - CodeGeneratorOperand operand = define.operand; - char *inst; - if (operand.isReference) { - asprintf(&inst, "def%ld %.*s, [%s]\n", define.bytes * 8, - (int)(define.label_end - define.label_begin), define.label_begin, - operand.value.reference); - } else { - asprintf(&inst, "def%ld %.*s, %lu\n", define.bytes * 8, - (int)(define.label_end - define.label_begin), define.label_begin, - operand.value.value); - } - codeGeneratorAppendFlatASMCommand(&fasm, &fasm_size, &fasm_inserted, inst, - strlen(inst)); - free(inst); - } - - fasm[fasm_inserted] = '\0'; - return fasm; -} - -bool codeGeneratorFlatASMExec(const char *filePath, const char *fasm) { - const size_t filePathLen = strlen(filePath); - char *asmFilePath = a404m_malloc((filePathLen + 4 + 1) * sizeof(char)); - strncpy(asmFilePath, filePath, filePathLen); - strcpy(asmFilePath + filePathLen, ".asm"); - - FILE *file = fopen(asmFilePath, "w"); - - if (file == NULL) { - free(asmFilePath); - return false; - } - - fwrite(fasm, sizeof(*fasm), strlen(fasm), file); - - fclose(file); - - char *command; - asprintf(&command, "fasm -m 102400 \"%s\" \"%s\"", asmFilePath, filePath); - free(asmFilePath); - - if (system(command) != 0) { - free(command); - return false; - } - free(command); - - asprintf(&command, "chmod + \"%s\"", filePath); - - if (system(command) != 0) { - free(command); - return false; - } - free(command); - - return true; -} diff --git a/src/compiler/code-generator.h b/src/compiler/code-generator.h deleted file mode 100644 index 3c3222a..0000000 --- a/src/compiler/code-generator.h +++ /dev/null @@ -1,105 +0,0 @@ -#pragma once - -#include "compiler/ast-tree.h" -#include <stddef.h> -#include <stdint.h> - -typedef enum CodeGeneratorInstruction : uint8_t { - CODE_GENERATOR_INSTRUCTION_PRINT_U64, - CODE_GENERATOR_INSTRUCTION_CALL, - CODE_GENERATOR_INSTRUCTION_RET, - CODE_GENERATOR_INSTRUCTION_MOV, - CODE_GENERATOR_INSTRUCTION_ADD, - CODE_GENERATOR_INSTRUCTION_FUNCTION_BEGIN, - CODE_GENERATOR_INSTRUCTION_FUNCTION_END, -} CodeGeneratorInstruction; - -typedef struct CodeGeneratorCode { - char *label_begin; - char *label_end; - CodeGeneratorInstruction instruction; - void *metadata; -} CodeGeneratorCode; - -typedef struct CodeGeneratorCall { - char *label_begin; - char *label_end; -} CodeGeneratorCall; - -typedef struct CodeGeneratorOperand { - union { - uint64_t value; - char *reference; - } value; - bool isReference; -} CodeGeneratorOperand; - -typedef struct CodeGeneratorDoubleOperand { - CodeGeneratorOperand op0; - CodeGeneratorOperand op1; -} CodeGeneratorDoubleOperand; - -typedef struct CodeGeneratorMov { - CodeGeneratorOperand op0; - CodeGeneratorOperand op1; - size_t bytes; -} CodeGeneratorMov; - -typedef struct CodeGeneratorFunctionBegin { - char *name_begin; - char *name_end; -} CodeGeneratorFunctionBegin; - -typedef struct CodeGeneratorFunctionEnd { - char *name_begin; - char *name_end; -} CodeGeneratorFunctionEnd; - -typedef struct CodeGeneratorDefine { - char *label_begin; - char *label_end; - CodeGeneratorOperand operand; - size_t bytes; -} CodeGeneratorDefine; - -typedef struct CodeGeneratorCodes { - CodeGeneratorCode *codes; - size_t codes_size; - CodeGeneratorDefine *defines; - size_t defines_size; -} CodeGeneratorCodes; - -void codeGeneratorOperandDestroy(CodeGeneratorOperand operand); -void codeGeneratorDelete(CodeGeneratorCodes *code); - -CodeGeneratorOperand *newCodeGeneratorOperand(void *value, bool isReference); -CodeGeneratorOperand makeCodeGeneratorOperand(void *value, bool isReference); - -CodeGeneratorFunctionBegin *newCodeGeneratorFunctionBegin(char *name_begin,char *name_end); -CodeGeneratorFunctionEnd *newCodeGeneratorFunctionEnd(char *name_begin,char *name_end); - -CodeGeneratorOperand *newCodeGeneratorOperandFromAstTree(AstTree tree); - -CodeGeneratorCode createGenerateCode(char *label_begin, char *label_end, - CodeGeneratorInstruction instruction, - void *metadata); - -CodeGeneratorDefine createGenerateDefine(char *label_begin, char *label_end, - CodeGeneratorOperand operand, - size_t bytes); - -CodeGeneratorCode *newGenerateCode(char *label_begin, char *label_end, - CodeGeneratorInstruction instruction); - -void generateCodePushCode(CodeGeneratorCodes *codes, CodeGeneratorCode code); -void generateCodePushDefine(CodeGeneratorCodes *codes, - CodeGeneratorDefine define); - -CodeGeneratorCodes *codeGenerator(AstTreeRoot *astTreeRoot); - -bool codeGeneratorAstTreeFunction(char *label_begin, char *label_end, - AstTree astTree, CodeGeneratorCodes *codes); - -char *codeGeneratorToFlatASM(const CodeGeneratorCodes *codes); - -bool codeGeneratorFlatASMExec(const char *filePath, const char *fasm); diff --git a/src/compiler/lexer.c b/src/compiler/lexer.c index 18326c9..1c8ae5d 100644 --- a/src/compiler/lexer.c +++ b/src/compiler/lexer.c @@ -276,6 +276,11 @@ void lexerPushClear(LexerNodeArray *array, size_t *array_size, char *iter, case LEXER_TOKEN_SYMBOL_FUNCTION_ARROW: case LEXER_TOKEN_SYMBOL_COLON: case LEXER_TOKEN_SYMBOL_ASSIGN: + case LEXER_TOKEN_SYMBOL_SUM_ASSIGN: + case LEXER_TOKEN_SYMBOL_SUB_ASSIGN: + case LEXER_TOKEN_SYMBOL_MULTIPLY_ASSIGN: + case LEXER_TOKEN_SYMBOL_DIVIDE_ASSIGN: + case LEXER_TOKEN_SYMBOL_MODULO_ASSIGN: case LEXER_TOKEN_SYMBOL_COMMA: case LEXER_TOKEN_SYMBOL_PLUS: case LEXER_TOKEN_SYMBOL_MINUS: diff --git a/src/compiler/parser.c b/src/compiler/parser.c index 2476e32..578d626 100644 --- a/src/compiler/parser.c +++ b/src/compiler/parser.c @@ -371,6 +371,7 @@ void parserNodePrint(const ParserNode *node, int indent) { for (int i = 0; i < indent; ++i) printf(" "); } + goto RETURN_SUCCESS; case PARSER_TOKEN_KEYWORD_WHILE: { ParserNodeIfMetadata *metadata = node->metadata; printf(",\n"); @@ -1,4 +1,3 @@ -#include "compiler/code-generator.h" #include "runner/runner.h" #include "utils/file.h" #include "utils/log.h" @@ -6,58 +5,6 @@ #include <stdio.h> #include <stdlib.h> -int compileRun(const char *filePath, const char *outFilePath, - bool print) { - char *code = readWholeFile(filePath); - - if (code == NULL) { - return 1; - } - - LexerNodeArray lexed = lexer(code); - if (lexerNodeArrayIsError(lexed)) { - return 1; - } - if (print) - lexerNodeArrayPrint(lexed); - - ParserNode *parsedRoot = parser(lexed); - lexerNodeArrayDestroy(lexed); - if (parsedRoot == NULL) { - return 1; - } - if (print) - parserNodePrint(parsedRoot, 0); - - AstTreeRoot *astTree = makeAstTree(parsedRoot); - parserNodeDelete(parsedRoot); - if (astTree == NULL) { - return 1; - } - if (print) - astTreeRootPrint(astTree); - - CodeGeneratorCodes *codes = codeGenerator(astTree); - astTreeRootDelete(astTree); - if (codes == NULL) { - return 1; - } - - char *fasm = codeGeneratorToFlatASM(codes); - codeGeneratorDelete(codes); - free(code); - - if (print) - puts(fasm); - - if (codeGeneratorFlatASMExec(outFilePath, fasm)) { - free(fasm); - return system(outFilePath); - } - - return 1; -} - int runWithoutRead(char *code, bool shouldPrint) { LexerNodeArray lexed = lexer(code); if (lexerNodeArrayIsError(lexed)) { |