From 78c4d3d06d8e863cfe2489281ccfe206544cbd7f Mon Sep 17 00:00:00 2001 From: hachem Date: Sun, 6 Sep 2026 00:40:37 +0200 Subject: fix: add utilities --- aoc-2025/day6.asm | 96 +++---------------------------------------------------- 1 file changed, 4 insertions(+), 92 deletions(-) (limited to 'aoc-2025/day6.asm') diff --git a/aoc-2025/day6.asm b/aoc-2025/day6.asm index 774ca4c..728b8b0 100644 --- a/aoc-2025/day6.asm +++ b/aoc-2025/day6.asm @@ -5,14 +5,7 @@ default rel global _start -%define SYS_EXIT 60 -%define SYS_READ 0 -%define SYS_WRITE 1 -%define SYS_OPEN 2 -%define SYS_CLOSE 3 - -%define O_RDONLY 0 -%define STDOUT 1 +%include "utils/io.asm" %define RAW_SIZE 1048576 %define MAX_W 8192 @@ -22,8 +15,6 @@ global _start section .data input_path db "input/day6.txt", 0 - newline db 10 - label1 db "Part 1: ", 0 label2 db "Part 2: ", 0 @@ -42,36 +33,14 @@ section .bss part1 resq 1 part2 resq 1 - number_buffer resb 32 - section .text _start: - mov rax, SYS_OPEN mov rdi, input_path - mov rsi, O_RDONLY - xor rdx, rdx - syscall - mov r12, rax - - xor r13, r13 -read_loop: - mov rax, SYS_READ - mov rdi, r12 - lea rsi, [raw + r13] + lea rsi, [raw] mov rdx, RAW_SIZE - sub rdx, r13 - syscall - cmp rax, 0 - jle read_done - add r13, rax - jmp read_loop -read_done: - mov [raw_len], r13 - - mov rax, SYS_CLOSE - mov rdi, r12 - syscall + call read_file + mov [raw_len], rax ; width = length of the first line xor rcx, rcx @@ -360,60 +329,3 @@ process_block: add [part2], r13 .ret: ret - -print_newline: - mov rax, SYS_WRITE - mov rdi, STDOUT - mov rsi, newline - mov rdx, 1 - syscall - ret - -print_int64: - mov rdi, number_buffer+31 - mov byte [rdi], 0 - dec rdi - - cmp rax, 0 - jne .conv - - mov byte [rdi], '0' - jmp .done -.conv: - mov rbx, 10 -.next: - xor rdx, rdx - div rbx - add dl, '0' - mov [rdi], dl - dec rdi - test rax, rax - jnz .next - - inc rdi -.done: - mov rax, SYS_WRITE - mov rsi, rdi - mov rdi, STDOUT - mov rdx, number_buffer+31 - sub rdx, rsi - syscall - ret - -print_string: - push rcx - push rdx - mov rdx, 0 -.length: - cmp byte [rcx+rdx], 0 - je .submit - inc rdx - jmp .length -.submit: - mov rax, SYS_WRITE - mov rdi, STDOUT - mov rsi, rcx - syscall - pop rdx - pop rcx - ret -- cgit v1.3