fix some double free, memory leaks, and seg faults
This commit is contained in:
@@ -16,14 +16,20 @@ size_t translate_parsed_declaration(Translated *translated,
|
||||
if (i==0) first = temp;
|
||||
size_t length = strlen(singleDeclaration->name);
|
||||
size_t offset = arena_push(&translated->constants, singleDeclaration->name, length);
|
||||
|
||||
push_instruction_code(translated, OP_LOAD_CONST);
|
||||
push_instruction_code(translated, 1);
|
||||
push_instruction_code(translated, TYPE_OP_STRING);
|
||||
push_instruction_code(translated,length);
|
||||
push_instruction_code(translated, offset);
|
||||
|
||||
push_instruction_code(translated, OP_DECLARE);
|
||||
push_instruction_code(translated, 0);
|
||||
push_instruction_code(translated, 1);
|
||||
}
|
||||
if (delcarations->size != 1) {
|
||||
push_instruction_code(translated, OP_LOAD_NULL);
|
||||
push_instruction_code(translated, 0);
|
||||
}
|
||||
return first;
|
||||
}
|
||||
21
src/translator/number/number.c
Normal file
21
src/translator/number/number.c
Normal file
@@ -0,0 +1,21 @@
|
||||
#include "../translator.h"
|
||||
#include "number.h"
|
||||
#include <gmp-x86_64.h>
|
||||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
size_t translate_parsed_number(Translated *translated, ParsedValue *parsedValue) {
|
||||
char *number_str = (char*)parsedValue->data;
|
||||
size_t length = strlen(number_str);
|
||||
size_t number_pos = arena_push(&translated->constants, number_str, length);
|
||||
set_registers(translated, 1);
|
||||
|
||||
size_t start = push_instruction_code(translated, OP_LOAD_CONST);
|
||||
push_instruction_code(translated, 0);
|
||||
|
||||
push_instruction_code(translated, TYPE_OP_NUMBER);
|
||||
push_instruction_code(translated,length);
|
||||
push_instruction_code(translated, number_pos);
|
||||
return start;
|
||||
}
|
||||
7
src/translator/number/number.h
Normal file
7
src/translator/number/number.h
Normal file
@@ -0,0 +1,7 @@
|
||||
#ifndef BYTECODE_NUMBER_H
|
||||
#define BYTECODE_NUMBER_H
|
||||
#include "../translator.h"
|
||||
|
||||
size_t translate_parsed_number(Translated *translated, ParsedValue *parsedValue);
|
||||
|
||||
#endif
|
||||
@@ -14,7 +14,5 @@ size_t translate_parsed_string(Translated *translated, ParsedValue *parsedValue)
|
||||
push_instruction_code(translated, TYPE_OP_STRING);
|
||||
push_instruction_code(translated,parsedString->length);
|
||||
push_instruction_code(translated, string_pos);
|
||||
fwrite(parsedString->string, 1, parsedString->length, stdout);
|
||||
putchar('\n');
|
||||
return start;
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
#include "translator.h"
|
||||
#include "string/string.h"
|
||||
#include "declaration/declaration.h"
|
||||
#include "number/number.h"
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
@@ -69,20 +70,27 @@ void set_registers(Translated * translator, size_t count) {
|
||||
if (count>translator->registerCount) translator->registerCount = count;
|
||||
}
|
||||
|
||||
size_t translate_parsed(Translated * translator, ParsedValue * parsedValue) {
|
||||
size_t translate_parsed(Translated * translated, ParsedValue * parsedValue) {
|
||||
switch (parsedValue->type) {
|
||||
case AST_STRING:
|
||||
return translate_parsed_string(translator,parsedValue);
|
||||
return translate_parsed_string(translated,parsedValue);
|
||||
case AST_DECLARATION:
|
||||
return translate_parsed_declaration(translator,parsedValue);
|
||||
return translate_parsed_declaration(translated,parsedValue);
|
||||
case AST_NUMBER:
|
||||
return translate_parsed_number(translated,parsedValue);
|
||||
case AST_NULL:
|
||||
set_registers(translated, 1);
|
||||
size_t output = push_instruction_code(translated, OP_LOAD_NULL);
|
||||
push_instruction_code(translated, 0);
|
||||
return output;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void translate(Translated * translator, DArray *ast) {
|
||||
void translate(Translated * translated, DArray *ast) {
|
||||
for (size_t i = 0; i<ast->size; i++) {
|
||||
ParsedValue * parsedValue = darray_get(ast, i);
|
||||
translate_parsed(translator,parsedValue);
|
||||
translate_parsed(translated,parsedValue);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include <stdint.h>
|
||||
|
||||
typedef enum { OP_LOAD_CONST = 255, OP_DECLARE, OP_LOAD_NULL, OP_JUMP } OperationType;
|
||||
typedef enum { TYPE_OP_STRING = 255 } types;
|
||||
typedef enum { TYPE_OP_STRING = 255, TYPE_OP_NUMBER } types;
|
||||
|
||||
typedef struct {
|
||||
void *data;
|
||||
|
||||
Reference in New Issue
Block a user