From 7b7e22e68fc11b5519445ec709db5daaf37287ad Mon Sep 17 00:00:00 2001
From: german <german.pavlov.def@inbox.ru>
Date: Fri, 20 Mar 2026 14:54:04 +0400
Subject: [PATCH] Review ntsys-assembler.h

---
 hello_user.exe    | Bin 220 -> 240 bytes
 ntsys             | Bin 40720 -> 40720 bytes
 ntsys-assembler.h |  19 +++++++++----------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/hello_user.exe b/hello_user.exe
index 82a81a135dc5a4f444cd37ab94439245ba142857..66b312390b74b4d5d0e28bdd956ad4e5e25e45d1 100644
GIT binary patch
delta 137
zcmcb^_<@nfH|iq;149D?1Cu_(L@rq#Rt9+nCLRzW!7x!bJSCoifssj?Ntlu8!u*R3
z7j|6ObYbhoCLIN!FoP5WlRQu*BT(}lAZB0?XJTMtWDo+9m!N!cMg~SMAx4NKkOS7h
Pw32}rq@78T3v3Jk4JQ<C

delta 89
zcmeysc!!b8H|iq;149D?1JgtvSvGkFCLo$<8a}a4-jWe02!sscK$4L`2*d{S#2FbF
Wxr7+u9FP`X21W)cCPgj=5DfrQW(d~+

diff --git a/ntsys b/ntsys
index 82acabb8db8985699ff4e56f81d31670f1aa50fa..6c2aa22b0f2d4182e031a70f7489604b80a2d01f 100755
GIT binary patch
delta 2244
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

delta 2240
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

diff --git a/ntsys-assembler.h b/ntsys-assembler.h
index 98068f0..63eb41c 100644
--- a/ntsys-assembler.h
+++ b/ntsys-assembler.h
@@ -95,13 +95,13 @@ int ntsys_compile_asm_stadion2(
         size_t* mem_pos, 
         char** labels, 
         word_t* labels_pos, 
-        size_t labels_count, 
+        size_t* labels_count, 
         dword_t* fsz,
         byte_t num
     ) {
     char* st = 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);
             fclose(fp);
             fclose(tmp);
@@ -119,6 +119,11 @@ int ntsys_compile_asm_stadion2(
     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) {
     FILE* fp = fopen(filename, "r");
     if (fp == NULL) {
@@ -144,10 +149,7 @@ int ntsys_compile_asm(char* filename, char* asm_out) {
         fclose(fp);
         return EXIT_FAILURE;
     }
-    if (ntsys_compile_asm_stadion2(
-        fp, tmp, lb_size, &mem_pos, 
-        labels, labels_pos, labels_count, &fsz, 0
-    ) != EXIT_SUCCESS) return EXIT_FAILURE;
+    if (ntsys_load_image_from_file(tmp, 0) != EXIT_SUCCESS) return EXIT_FAILURE;
     fclose(tmp);
     rewind(fp);
     FILE* fw = fopen(asm_out, "wb");
@@ -156,10 +158,7 @@ int ntsys_compile_asm(char* filename, char* asm_out) {
         fclose(fp);
         return EXIT_FAILURE;
     }
-    if (ntsys_compile_asm_stadion2(
-        fp, fw, lb_size, &mem_pos, 
-        labels, labels_pos, labels_count, &fsz, 1
-    ) != EXIT_SUCCESS) return EXIT_FAILURE;
+    if (ntsys_load_image_from_file(fw, 1) != EXIT_SUCCESS) return EXIT_FAILURE;
     fflush(fw);
     fclose(fp);
     size_t i = 0;