German/ntsys
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Review ntsys-assembler.h

Browse Source
This commit is contained in:
german 2026-03-20 14:54:04 +04:00
parent b7590e11b0
commit 7b7e22e68f
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
hello_user.exe
View File

Binary file not shown.

BIN
ntsys
View File

Binary file not shown.

19
ntsys-assembler.h
View File

@ -95,13 +95,13 @@ int ntsys_compile_asm_stadion2(
size_t* mem_pos, size_t* mem_pos,
char** labels, char** labels,
word_t* labels_pos, word_t* labels_pos,
size_t labels_count, size_t* labels_count,
dword_t* fsz, dword_t* fsz,
byte_t num byte_t num
) { ) {
char* st = NULL; char* st = NULL;
while ((st = ntsys_get_str(st, fp)) != NULL) { while ((st = ntsys_get_str(st, fp)) != NULL) {
if (ntsys_asm_from_string(mem_pos, st, tmp, num, labels, labels_pos, &labels_count, fsz) != EXIT_SUCCESS) { if (ntsys_asm_from_string(mem_pos, st, tmp, num, labels, labels_pos, labels_count, fsz) != EXIT_SUCCESS) {
free(st); free(st);
fclose(fp); fclose(fp);
fclose(tmp); fclose(tmp);
@ -119,6 +119,11 @@ int ntsys_compile_asm_stadion2(
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
#define ntsys_load_image_from_file(file, num) ( ntsys_compile_asm_stadion2( \
fp, (file), lb_size, &mem_pos, \
labels, labels_pos, &labels_count, &fsz, (num) \
) != EXIT_SUCCESS )
int ntsys_compile_asm(char* filename, char* asm_out) { int ntsys_compile_asm(char* filename, char* asm_out) {
FILE* fp = fopen(filename, "r"); FILE* fp = fopen(filename, "r");
if (fp == NULL) { if (fp == NULL) {
@ -144,10 +149,7 @@ int ntsys_compile_asm(char* filename, char* asm_out) {
fclose(fp); fclose(fp);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (ntsys_compile_asm_stadion2( if (ntsys_load_image_from_file(tmp, 0) != EXIT_SUCCESS) return EXIT_FAILURE;
fp, tmp, lb_size, &mem_pos,
labels, labels_pos, labels_count, &fsz, 0
) != EXIT_SUCCESS) return EXIT_FAILURE;
fclose(tmp); fclose(tmp);
rewind(fp); rewind(fp);
FILE* fw = fopen(asm_out, "wb"); FILE* fw = fopen(asm_out, "wb");
@ -156,10 +158,7 @@ int ntsys_compile_asm(char* filename, char* asm_out) {
fclose(fp); fclose(fp);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (ntsys_compile_asm_stadion2( if (ntsys_load_image_from_file(fw, 1) != EXIT_SUCCESS) return EXIT_FAILURE;
fp, fw, lb_size, &mem_pos,
labels, labels_pos, labels_count, &fsz, 1
) != EXIT_SUCCESS) return EXIT_FAILURE;
fflush(fw); fflush(fw);
fclose(fp); fclose(fp);
size_t i = 0; size_t i = 0;