Skip to content

Commit

Permalink
Add: basic functionality fixes
Browse files Browse the repository at this point in the history 
- added starting address command line option
- made flags separate again
- updated help screen
- added default output name
- added several memory management improvements
- ready for minimal feature release
  • Loading branch information
@FifthZoner
FifthZoner committed Jan 26, 2025
1 parent aab7837 commit 3dd0625
Show file tree
Hide file tree
Showing 10 changed files with 170 additions and 52 deletions.
8 changes: 7 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
### ILAssembler

This is a simple IEC61131 IL (Instruction List) assembler I'm making for my university low level programming course.
This is a simple IEC61131 IL (Instruction List) assembler I'm making for my university low level programming course.

Compile with your favourite C compiler toolchain, only standard library was used.

Please report any bugs found within this software.

Tested on linux x86-64 with CMake + GCC 14.2.1.
Binary file removed result.hex
View file
Binary file not shown.
23 changes: 17 additions & 6 deletions src/assembler_runner.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#include <iso646.h>
#include <stdio.h>


#include <stdlib.h>
#include <string.h>


bool run_line(LexerLine* line, FILE* out, Translator* translator) {
Expand All @@ -26,7 +26,7 @@ bool run_line(LexerLine* line, FILE* out, Translator* translator) {
// at this point it should be an actual instruction
const TranslatorEntry* result = translator_get(translator, line->tokens[0].token.text, line->tokens[0].length, 0);

if (result->content.called_function == nullptr) {
if (result == nullptr or result->content.called_function == nullptr) {
printf("Error type: Instruction identifier not recognized!\n");
return false;
}
Expand All @@ -46,9 +46,19 @@ bool run_line(LexerLine* line, FILE* out, Translator* translator) {

bool run_assembling(const LexerOutput* const lexer_output, const CommandArguments* const arguments, struct Translator* translator) {

// TODO: add default name

FILE* out = fopen(arguments->output_file, "wb");
FILE* out;
if (arguments->output_file == nullptr) {
uint32_t length = strnlen(arguments->source_file, MAX_ARGUMENT_LENGTH);
char* temp = (char*)malloc(sizeof(char) * (length + 5));
strncpy(temp, arguments->source_file, length);
strncpy(temp + length, ".hex", 4);
temp[length + 4] = '\0';
out = fopen(temp, "wb");
free(temp);
}
else {
out = fopen(arguments->output_file, "wb");
}
if (out == nullptr) {
printf("Could not open output file: \"%s\"\n", arguments->output_file);
return 0;
Expand All @@ -65,6 +75,7 @@ bool run_assembling(const LexerOutput* const lexer_output, const CommandArgument


fclose(out);

translator_clear(translator);
return true;
}
71 changes: 62 additions & 9 deletions src/lexer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ bool detect_token_types(LexerLine* line, struct Translator* translator, uint64_t

// checking for invalid negative
current_token->data.valid_numeric = true;
current_token->data.is_copied = false;
for (uint32_t n = 0; n < current_token->length; n++) {
if (current_token->token.text[n] == '-' and n != 0) {
current_token->data.valid_numeric = false;
Expand Down Expand Up @@ -195,6 +196,7 @@ bool detect_token_types(LexerLine* line, struct Translator* translator, uint64_t

if (current_token->length == 1 and current_token->token.text[0] == instruction_dividing_character) {
free(current_token->token.text);
current_token->token.text = nullptr;
current_token->length = 0;
current_token->data.general_type = divider;
continue;
Expand All @@ -203,6 +205,7 @@ bool detect_token_types(LexerLine* line, struct Translator* translator, uint64_t
if (current_token->data.valid_boolean) {
const int32_t value = current_token->token.text[0] - '0';
free(current_token->token.text);
current_token->token.text = nullptr;
current_token->token.boolean = value;
current_token->length = 0;
current_token->data.general_type = numeric;
Expand Down Expand Up @@ -237,6 +240,7 @@ bool detect_token_types(LexerLine* line, struct Translator* translator, uint64_t
if (current_token->data.valid_decimal) {
const int32_t value = (int32_t)strtol(current_token->token.text, nullptr, 10);
free(current_token->token.text);
current_token->token.text = nullptr;
current_token->token.integer = value;
current_token->length = 0;
current_token->data.general_type = numeric;
Expand All @@ -247,6 +251,7 @@ bool detect_token_types(LexerLine* line, struct Translator* translator, uint64_t
if (current_token->data.valid_real) {
const float value = strtof(current_token->token.text, nullptr);
free(current_token->token.text);
current_token->token.text = nullptr;
current_token->token.real = value;
current_token->length = 0;
current_token->data.general_type = numeric;
Expand All @@ -257,6 +262,7 @@ bool detect_token_types(LexerLine* line, struct Translator* translator, uint64_t
if (current_token->data.valid_hex) {
const int32_t value = (int32_t)strtoul(current_token->token.text, nullptr, 16);
free(current_token->token.text);
current_token->token.text = nullptr;
current_token->token.hex = value;
current_token->length = 0;
current_token->data.general_type = numeric;
Expand All @@ -267,6 +273,7 @@ bool detect_token_types(LexerLine* line, struct Translator* translator, uint64_t
if (current_token->data.valid_octal) {
const int32_t value = (int32_t)strtoul(current_token->token.text, nullptr, 8);
free(current_token->token.text);
current_token->token.text = nullptr;
current_token->token.oct = value;
current_token->length = 0;
current_token->data.general_type = numeric;
Expand All @@ -277,6 +284,7 @@ bool detect_token_types(LexerLine* line, struct Translator* translator, uint64_t
if (current_token->data.valid_binary) {
const int32_t value = (int32_t)strtoul(current_token->token.text, nullptr, 2);
free(current_token->token.text);
current_token->token.text = nullptr;
current_token->token.bin = value;
current_token->length = 0;
current_token->data.general_type = numeric;
Expand Down Expand Up @@ -312,7 +320,6 @@ void add_token(const char* address, const uint32_t length, LexerLine* line) {
LexerLine split_line(char* line, struct Translator* translator, uint64_t index) {
// the main lexer function actually
// takes the line and changes it into tokens
// TODO: ADD MEMORY DEALLOCATION AFTER ASSEMBLING

LexerLine output;
output.token_amount = 0;
Expand Down Expand Up @@ -367,8 +374,13 @@ LexerLine split_line(char* line, struct Translator* translator, uint64_t index)
start = current_index + 1;
}

// TODO: add error handling here
detect_token_types(&output, translator, index);
if (not detect_token_types(&output, translator, index)) {
printf("Error: could not proceed during token type detection!\n");
// TODO: there is a more complex case with deallocation here, will be skipped for now
output.capacity = 0;
output.token_amount = 1;
return output;
}

// detecting EQU statements
if (output.token_amount > 2 and output.tokens[0].data.general_type == instruction and output.tokens[1].data.general_type == EQU) {
Expand Down Expand Up @@ -408,11 +420,21 @@ bool lex_file(const CommandArguments* arguments, FILE* file, LexerOutput* output
if (split.token_amount == 0) {
continue;
}
if (split.capacity == 0 and split.token_amount == 1) {
split.token_amount = 0;
return false;
}

if (output->capacity == output->lines_amount) {
// in that case more space is needed, let's double it
output->lines = (LexerLine*)realloc(output->lines, sizeof(LexerLine) * output->capacity * 2);
output->capacity *= 2;
if (output->capacity == 0) {
output->lines = (LexerLine*)malloc(sizeof(LexerLine));
output->capacity = 1;
}
else {
output->lines = (LexerLine*)realloc(output->lines, sizeof(LexerLine) * output->capacity * 2);
output->capacity *= 2;
}
}

output->lines[output->lines_amount++] = split;
Expand All @@ -433,6 +455,7 @@ LexerOutput run_lexer(const CommandArguments* arguments, LexerFiles* files, stru
if (arguments->splitting_by_dot) {
instruction_dividing_character = '.';
}
program_start_offset = arguments->start_address;

files->files = (char**)malloc(sizeof(char*));
files->capacity = 1;
Expand All @@ -444,9 +467,7 @@ LexerOutput run_lexer(const CommandArguments* arguments, LexerFiles* files, stru

if (current == nullptr) {
printf("Error: File \"%s\" could not be opened!\n", files->files[file_index]);
if (output.capacity > 0) {
free(output.lines);
}
free_lexer_output(&output);
output.lines_amount = 0;
return output;
}
Expand All @@ -469,7 +490,7 @@ LexerOutput run_lexer(const CommandArguments* arguments, LexerFiles* files, stru
// find the variable and replace it with proper tokens
TranslatorEntry* result = translator_get(translator, output.lines[n].tokens[m].token.text, output.lines[n].tokens[m].length, 0);
if (result == nullptr or not result->is_variable) {
// TODO: add error handling here
printf("Error: variable identifier not found!\n");
return output;
}
// inputting the new values
Expand All @@ -485,10 +506,42 @@ LexerOutput run_lexer(const CommandArguments* arguments, LexerFiles* files, stru
}
for (uint32_t k = m, l = 0; l < result->content.variable->token_amount; k++, l++) {
output.lines[n].tokens[k] = result->content.variable->tokens[l];
output.lines[n].tokens[k].data.is_copied = true; // thanks to that it's memory will not be freed
}
output.lines[n].token_amount = new_size;
}
}
}
return output;
}


// freeing functions
void free_lexer_token(LexerToken* token) {
if (not token->data.is_copied) {
if (token->data.general_type != numeric and token->token.text != nullptr) {
free(token->token.text);
token->token.text = nullptr;
}
}
}

void free_lexer_line(LexerLine* line) {
for (uint64_t n = 0; n < line->token_amount; n++) {
free_lexer_token(line->tokens + n);
}
if (line->token_amount > 0) {
free(line->tokens);
line->tokens = nullptr;
}
}

void free_lexer_output(LexerOutput* output) {
for (uint64_t n = 0; n < output->lines_amount; n++) {
free_lexer_line(output->lines + n);
}
if (output->lines_amount > 0) {
free(output->lines);
output->lines = nullptr;
}
}
8 changes: 8 additions & 0 deletions src/lexer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ typedef struct LexerToken {
bool valid_boolean : 1;
bool valid_real : 1;
bool valid_numeric : 1;
bool is_copied : 1;
} data;
} LexerToken;

Expand All @@ -65,6 +66,13 @@ typedef struct LexerFiles {
char** files;
} LexerFiles;

// freeing functions
void free_lexer_token(LexerToken* token);

void free_lexer_line(LexerLine* line);

void free_lexer_output(LexerOutput* output);

#include "translator.h"

LexerOutput run_lexer(const CommandArguments* arguments, LexerFiles* files, struct Translator* translator);
Expand Down
12 changes: 8 additions & 4 deletions src/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,15 @@ int main(int argc, const char** argv) {
// when displaying help skip the run
if (arguments.display_help) {
printf("IL Assembler help:\n"
"To run the assembler use: \"<not sure about the name> <source file> (-d/-c) <output file>\"\n"
"To run the assembler use: \"<name of the binary> <source file> <output file> (-d/-c) (-s <size>)\"\n"
"Flags:\n"
"-c - separating instruction arguments by a comma (default)\n"
"-d - separating instruction arguments by a dot\n"
"-s - specify the start address, put a decimal or hex number (0x<number>) after the flag, default value is 0\n"
"The first path found is always the source file and the second, optional one is the output file, if it's not specified it will be called <source name>.hex\n"
"\n"
"Thank you for using my software!\n"
"Please report any found bugs and feature requests at: https://github.com/FifthZoner/ILAssembler\n"
);
return 0;
}
Expand All @@ -33,17 +37,17 @@ int main(int argc, const char** argv) {

add_instruction_handlers(&translator);

const LexerOutput lexer_output = run_lexer(&arguments, &files, &translator);
LexerOutput lexer_output = run_lexer(&arguments, &files, &translator);
if (lexer_output.lines_amount == 0) {
return 1;
}

run_assembling(&lexer_output, &arguments, &translator);

// TODO: add freeing for every string
free(files.files);
free_lexer_output(&lexer_output);

// TODO: add lexer output freeing here
// TODO: add translator freeing

printf("Assembling complete!\n");
return 0;
Expand Down
Loading

0 comments on commit 3dd0625

Please sign in to comment.