oreodave/obf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor obc for new vector based assembler and better config parser

Browse Source 
Simpler implementation for configuration parsing with default values.
Now using new assembler functions.
This commit is contained in:
Aryadev Chavali
2024-12-19 08:46:19 +00:00
parent 7686c1043c
commit b03ef6564a
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
obc.c
View File

@@ -59,6 +59,7 @@ int parse_config(struct Config *config, int argc, char *argv[])
} }
if (!config->prog_name) if (!config->prog_name)
return 0; return 0;
return 1; return 1;
} }
@@ -70,8 +71,9 @@ int main(int argc, char *argv[])
return 1; return 1;
} }
char *file_data = NULL; char *file_data = NULL;
buffer_t *buffer = NULL, *asm_buffer = NULL; buffer_t *buffer = NULL;
vec_t asm_buffer = {0};
struct PResult res = {0}; struct PResult res = {0};
struct Config config = {0}; struct Config config = {0};
@@ -81,6 +83,12 @@ int main(int argc, char *argv[])
usage(argv[0], stderr); usage(argv[0], stderr);
goto end; goto end;
} }
if (!config.asm_name)
config.asm_name = "a.asm";
if (!config.obj_name)
config.obj_name = "a.o";
if (!config.exec_name)
config.exec_name = "a.out";
ret = 0; ret = 0;
FILE *handle = fopen(config.prog_name, "r"); FILE *handle = fopen(config.prog_name, "r");
@@ -102,15 +110,10 @@ int main(int argc, char *argv[])
goto end; goto end;
} }
asm_setup_buffer(&asm_buffer, config.asm_name ? config.asm_name : "a.asm");
asm_translate_nodes(&asm_buffer, res, config.prog_name); asm_translate_nodes(&asm_buffer, res, config.prog_name);
asm_write(&asm_buffer); asm_compile(&asm_buffer, config.asm_name, config.obj_name, config.exec_name);
asm_assemble(asm_buffer->name, config.obj_name ? config.obj_name : "a.o");
asm_link(config.obj_name ? config.obj_name : "a.o",
config.exec_name ? config.exec_name : "a.out");
end: end:
if (asm_buffer) vec_free(&asm_buffer);
free(asm_buffer);
if (res.nodes) if (res.nodes)
free(res.nodes); free(res.nodes);
if (buffer) if (buffer)