diff --git a/asm-savers.h b/asm-savers.h index cf91ae7..b6d4af9 100644 --- a/asm-savers.h +++ b/asm-savers.h @@ -74,7 +74,6 @@ static void __str_slice(char* str) { char* ntsys_get_arg(ntsys_asm_cache_t save) { char* str = save->cache; - printf("Cache : %s\n", save->cache); while (1) { if ((!is_space(str[0])) || str[0] == '\0') { break; @@ -96,7 +95,6 @@ char* ntsys_get_arg(ntsys_asm_cache_t save) { save->cache = &str[n_p + t]; str[n_p] = '\0'; } - printf("Switch : %s\n", save->cache); if (str[strlen(str) - 1] == '\n' || str[strlen(str) - 1] == '\r') str[strlen(str) - 1] = '\0'; if (strlen(str) == 0) { str = NULL; @@ -138,11 +136,6 @@ char* ntsys_get_arg(ntsys_asm_cache_t save) { } } save->string = str; -<<<<<<< HEAD - printf("Loading : %s\n", save->string); -======= - printf("Loading : %s\n", str); ->>>>>>> fixed return str; } @@ -406,7 +399,6 @@ int __ntsys_arg_function_loader(ntsys_argument_parser_t* parser) { if (select_argument(parser) == EXIT_FAILURE) return EXIT_FAILURE; } if (parser->is_rewrite == 0) *parser->file_size = ftell(parser->fp) + 1; - fflush(parser->fp); return EXIT_SUCCESS; } diff --git a/dump.bin b/dump.bin index cf6abf9..a7693cf 100644 Binary files a/dump.bin and b/dump.bin differ diff --git a/input.asm b/input.asm index 74d2d3a..695c8a4 100644 --- a/input.asm +++ b/input.asm @@ -1,10 +1,10 @@ main: push.string "Введите ваше имя: " ; Строка - push byte 0x00 + push byte, 0x00 syscall getch: - push db getch - push byte 0x01 + push db, getch + push byte, 0x01 syscall - push byte 0x0A + push byte, 0x0A neq byte diff --git a/input.exe b/input.exe index 0bf753d..a157004 100644 Binary files a/input.exe and b/input.exe differ diff --git a/ntsys b/ntsys new file mode 100755 index 0000000..7d447f1 Binary files /dev/null and b/ntsys differ diff --git a/ntsys-assembler.h b/ntsys-assembler.h index d4e1dc0..af66c67 100644 --- a/ntsys-assembler.h +++ b/ntsys-assembler.h @@ -55,6 +55,7 @@ int ntsys_asm_from_string(size_t* mempos, char* str, FILE* fp, byte_t cycle, nts ntsys_asm_save_t __save = create_ntsys_asm_save(str); ntsys_asm_cache_t __cache = create_ntsys_asm_cache(__save); ntsys_argument_parser_t parser = create_ntsys_asm_parser(__cache, fp, str, ntsys_asm_table, ntsys_command_count, labels, labels_pos, labels_count, cycle, fsz); + /*puts(str);*/ return ntsys_run_asm_parser(parser); } diff --git a/out.exe b/out.exe deleted file mode 100644 index 65b9e18..0000000 Binary files a/out.exe and /dev/null differ