From 78c4d3d06d8e863cfe2489281ccfe206544cbd7f Mon Sep 17 00:00:00 2001
From: hachem <im@hachem.wtf>
Date: Sun, 6 Sep 2026 00:40:37 +0200
Subject: fix: add utilities

---
 aoc-2025/day5.asm | 116 +++---------------------------------------------------
 1 file changed, 5 insertions(+), 111 deletions(-)

(limited to 'aoc-2025/day5.asm')

diff --git a/aoc-2025/day5.asm b/aoc-2025/day5.asm
index 4f395a0..4718343 100644
--- a/aoc-2025/day5.asm
+++ b/aoc-2025/day5.asm
@@ -5,14 +5,8 @@ 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"
+%include "utils/parse.asm"
 
 %define RAW_SIZE   1048576  ; 1 MiB scratch for the raw file
 %define MAX_RANGES 8192     ; plenty for the ~177 input ranges
@@ -20,8 +14,6 @@ global _start
 section .data
     input_path db "input/day5.txt", 0
 
-    newline    db 10
-
     label1     db "Part 1: ", 0
     label2     db "Part 2: ", 0
 
@@ -38,36 +30,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  ; fd
-
-    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
 
     ; RSI = cursor, R14 = end pointer (both preserved across helper calls)
     lea     rsi, [raw]
@@ -146,25 +116,6 @@ print_results:
     xor     rdi, rdi
     syscall
 
-; parse_u64: read decimal digits at [RSI], advancing RSI past them.
-;   Output: RAX = value. Stops on the first non-digit. Clobbers RAX, RDX.
-parse_u64:
-    xor     rax, rax
-.digit:
-    mov     dl, [rsi]
-    cmp     dl, '0'
-    jl      .done
-    cmp     dl, '9'
-    jg      .done
-    sub     dl, '0'
-    movzx   rdx, dl
-    imul    rax, rax, 10
-    add     rax, rdx
-    inc     rsi
-    jmp     .digit
-.done:
-    ret
-
 ; is_fresh: test membership of an ID in the merged intervals.
 ;   Input:  RDI = id
 ;   Output: RAX = 1 if the id lies in any interval, else 0
@@ -272,60 +223,3 @@ finalize_ranges:
     inc     rdx  ; end - start + 1
     add     r12, rdx
     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