diff options
| -rw-r--r-- | file.inc | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -13,10 +13,10 @@ %endif struc FileData -fname: resq 1 -buffer: resq 1 -size: resq 1 -fd: resq 1 +fd_fname: resq 1 +fd_buffer: resq 1 +fd_size: resq 1 +fd_fd: resq 1 endstruc %macro make_fbuffer 3 @@ -26,17 +26,17 @@ endstruc section .data %2_fname: db %1,0 %2_buffer: times %3 db 0 - db 0 + db 0 %2_bufferLen: equ $ - %2_buffer section .bss %2_fd: resq 1 section .data %2_filedata: istruc FileData - at fname, dq %2_fname - at buffer, dq %2_buffer - at size, dq %2_bufferLen - at fd, dq %2_fd + at fd_fname, dq %2_fname + at fd_buffer, dq %2_buffer + at fd_size, dq %2_bufferLen + at fd_fd, dq %2_fd iend %endm @@ -83,13 +83,13 @@ ffopen: mov rbp, rsp ;; RAX = filedata push rax - mov rdi, [rax + fname] + mov rdi, [rax + fd_fname] mov rax, SYS_OPEN xor rsi, rsi syscall pop rdx mov rcx, rdx - mov rdx, [rdx + fd] + mov rdx, [rdx + fd_fd] mov [rdx], rax mov rax, rcx ;; @@ -100,10 +100,10 @@ ffopen: ffread: push rbp mov rbp, rsp - mov rdi, [rax + fd] + mov rdi, [rax + fd_fd] mov rdi, [rdi] - mov rsi, [rax + buffer] - mov rdx, [rax + size] + mov rsi, [rax + fd_buffer] + mov rdx, [rax + fd_size] mov rax, SYS_READ syscall ;; @@ -116,7 +116,7 @@ print_filedata: mov rbp, rsp ;; RAX = filedata push rax - mov rax, [rax + buffer] + mov rax, [rax + fd_buffer] call print_zstring pop rax mov rsp, rbp |