IgorCielniak/l2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed useless strlen from stdlib.sl

Browse Source
This commit is contained in:
IgorCielniak
2025-12-18 12:03:49 +01:00
parent 50451840b7
commit f684e56a70
14 changed files with 226 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
a.out
View File

Binary file not shown.

72
build/a.asm
View File

@@ -18,17 +18,30 @@ _start:
mov rdi, rax mov rdi, rax
mov rax, 60 mov rax, 60
syscall syscall
word_c_40:
mov rax, [r12]
movzx rax, byte [rax]
mov [r12], rax
ret
ret
word_c_21:
mov rax, [r12]
add r12, 8
mov rbx, [r12]
mov [rbx], al
ret
ret
word_r_40:
mov rax, [r13]
sub r12, 8
mov [r12], rax
ret
ret
word_strlen: word_strlen:
mov rsi, [r12] ; addr mov rax, [r12] ; addr
mov rcx, 0 mov rcx, [r12 + 8] ; len
strlen_loop: add r12, 16 ; pop len and addr
mov al, [rsi + rcx] mov [r12], rcx ; push len
cmp al, 0
je strlen_done
inc rcx
jmp strlen_loop
strlen_done:
mov [r12], rcx ; len
ret ret
ret ret
word_puts: word_puts:
@@ -113,6 +126,15 @@ word_dup:
sub r12, 8 sub r12, 8
mov [r12], rax mov [r12], rax
ret ret
word_write_buf:
mov rdx, [r12] ; len
mov rsi, [r12 + 8] ; addr
add r12, 16 ; pop len + addr
mov rax, 1 ; syscall: write
mov rdi, 1 ; fd = stdout
syscall
ret
ret
word_drop: word_drop:
add r12, 8 add r12, 8
ret ret
@@ -284,20 +306,22 @@ word__21:
add r12, 8 add r12, 8
ret ret
word_mmap: word_mmap:
mov r9, [r12] ; Save rsp and align to 16 bytes for syscall ABI
add r12, 8 mov rax, rsp
mov r8, [r12] and rsp, -16
add r12, 8 mov rdi, [r12+40] ; addr
mov r10, [r12] mov rsi, [r12+32] ; length
add r12, 8 mov rdx, [r12+24] ; prot
mov rdx, [r12] mov r10, [r12+16] ; flags
add r12, 8 mov r8, [r12+8] ; fd
mov rsi, [r12] mov r9, [r12] ; offset
add r12, 8 add r12, 48 ; pop 6 args
mov rdi, [r12] mov rax, 9 ; syscall: mmap
mov rax, 9 syscall
syscall mov rsp, rax ; restore rsp
mov [r12], rax sub r12, 8
mov [r12], rax ; push result
ret
ret ret
word_munmap: word_munmap:
mov rsi, [r12] mov rsi, [r12]

BIN
build/a.o
View File

Binary file not shown.

65
build/hello.asm
View File

@@ -18,6 +18,32 @@ _start:
mov rdi, rax mov rdi, rax
mov rax, 60 mov rax, 60
syscall syscall
word_c_40:
mov rax, [r12]
movzx rax, byte [rax]
mov [r12], rax
ret
ret
word_c_21:
mov rax, [r12]
add r12, 8
mov rbx, [r12]
mov [rbx], al
ret
ret
word_r_40:
mov rax, [r13]
sub r12, 8
mov [r12], rax
ret
ret
word_strlen:
mov rax, [r12] ; addr
mov rcx, [r12 + 8] ; len
add r12, 16 ; pop len and addr
mov [r12], rcx ; push len
ret
ret
word_puts: word_puts:
; detects string if top is len>=0 and next is a pointer in [data_start, data_end] ; detects string if top is len>=0 and next is a pointer in [data_start, data_end]
mov rax, [r12] ; len or int value mov rax, [r12] ; len or int value
@@ -100,6 +126,15 @@ word_dup:
sub r12, 8 sub r12, 8
mov [r12], rax mov [r12], rax
ret ret
word_write_buf:
mov rdx, [r12] ; len
mov rsi, [r12 + 8] ; addr
add r12, 16 ; pop len + addr
mov rax, 1 ; syscall: write
mov rdi, 1 ; fd = stdout
syscall
ret
ret
word_drop: word_drop:
add r12, 8 add r12, 8
ret ret
@@ -271,20 +306,22 @@ word__21:
add r12, 8 add r12, 8
ret ret
word_mmap: word_mmap:
mov r9, [r12] ; Save rsp and align to 16 bytes for syscall ABI
add r12, 8 mov rax, rsp
mov r8, [r12] and rsp, -16
add r12, 8 mov rdi, [r12+40] ; addr
mov r10, [r12] mov rsi, [r12+32] ; length
add r12, 8 mov rdx, [r12+24] ; prot
mov rdx, [r12] mov r10, [r12+16] ; flags
add r12, 8 mov r8, [r12+8] ; fd
mov rsi, [r12] mov r9, [r12] ; offset
add r12, 8 add r12, 48 ; pop 6 args
mov rdi, [r12] mov rax, 9 ; syscall: mmap
mov rax, 9 syscall
syscall mov rsp, rax ; restore rsp
mov [r12], rax sub r12, 8
mov [r12], rax ; push result
ret
ret ret
word_munmap: word_munmap:
mov rsi, [r12] mov rsi, [r12]

BIN
build/hello.o
View File

Binary file not shown.

65
build/main.asm
View File

@@ -18,6 +18,32 @@ _start:
mov rdi, rax mov rdi, rax
mov rax, 60 mov rax, 60
syscall syscall
word_c_40:
mov rax, [r12]
movzx rax, byte [rax]
mov [r12], rax
ret
ret
word_c_21:
mov rax, [r12]
add r12, 8
mov rbx, [r12]
mov [rbx], al
ret
ret
word_r_40:
mov rax, [r13]
sub r12, 8
mov [r12], rax
ret
ret
word_strlen:
mov rax, [r12] ; addr
mov rcx, [r12 + 8] ; len
add r12, 16 ; pop len and addr
mov [r12], rcx ; push len
ret
ret
word_puts: word_puts:
; detects string if top is len>=0 and next is a pointer in [data_start, data_end] ; detects string if top is len>=0 and next is a pointer in [data_start, data_end]
mov rax, [r12] ; len or int value mov rax, [r12] ; len or int value
@@ -100,6 +126,15 @@ word_dup:
sub r12, 8 sub r12, 8
mov [r12], rax mov [r12], rax
ret ret
word_write_buf:
mov rdx, [r12] ; len
mov rsi, [r12 + 8] ; addr
add r12, 16 ; pop len + addr
mov rax, 1 ; syscall: write
mov rdi, 1 ; fd = stdout
syscall
ret
ret
word_drop: word_drop:
add r12, 8 add r12, 8
ret ret
@@ -271,20 +306,22 @@ word__21:
add r12, 8 add r12, 8
ret ret
word_mmap: word_mmap:
mov r9, [r12] ; Save rsp and align to 16 bytes for syscall ABI
add r12, 8 mov rax, rsp
mov r8, [r12] and rsp, -16
add r12, 8 mov rdi, [r12+40] ; addr
mov r10, [r12] mov rsi, [r12+32] ; length
add r12, 8 mov rdx, [r12+24] ; prot
mov rdx, [r12] mov r10, [r12+16] ; flags
add r12, 8 mov r8, [r12+8] ; fd
mov rsi, [r12] mov r9, [r12] ; offset
add r12, 8 add r12, 48 ; pop 6 args
mov rdi, [r12] mov rax, 9 ; syscall: mmap
mov rax, 9 syscall
syscall mov rsp, rax ; restore rsp
mov [r12], rax sub r12, 8
mov [r12], rax ; push result
ret
ret ret
word_munmap: word_munmap:
mov rsi, [r12] mov rsi, [r12]

BIN
build/main.o
View File

Binary file not shown.

64
build/str.asm
View File

@@ -472,7 +472,57 @@ word_read_file:
mov qword [r12 + 8], -3 mov qword [r12 + 8], -3
ret ret
ret ret
word_main: word_write_file:
; stack: path_ptr (top), path_len, buf_ptr, buf_len
mov rsi, [r12] ; path_ptr
mov rdx, [r12 + 8] ; path_len
mov r15, [r12 + 16] ; buf_ptr (save in callee-saved r15)
mov r13, [r12 + 24] ; buf_len (save in callee-saved r13)
add r12, 32 ; pop 4 args (we saved buf info)
; open(path_ptr, O_WRONLY|O_CREAT|O_TRUNC, 0666)
mov rdi, rsi ; filename
mov rsi, 577 ; flags = O_WRONLY|O_CREAT|O_TRUNC
mov rdx, 438 ; mode = 0o666
mov rax, 2 ; syscall: open
syscall
cmp rax, 0
jl .fail_open
mov r9, rax ; save fd
; write(fd, buf_ptr, buf_len) -- use preserved r15/r13 which survive syscalls
mov rax, 1 ; syscall: write
mov rdi, r9 ; fd
mov rsi, r15 ; buf_ptr
mov rdx, r13 ; buf_len
syscall
mov r10, rax ; save write result
cmp r10, 0
jl .fail_write
; close(fd)
mov rax, 3 ; syscall: close
mov rdi, r9
syscall
sub r12, 8
mov [r12], r10
ret
.fail_write:
mov rax, 3
mov rdi, r9
syscall
sub r12, 8
mov [r12], r10
ret
.fail_open:
sub r12, 8
mov [r12], rax
ret
ret
word_main2:
; push str_0 ; push str_0
sub r12, 8 sub r12, 8
mov qword [r12], str_0 mov qword [r12], str_0
@@ -486,10 +536,22 @@ word_main:
sub r12, 8 sub r12, 8
mov qword [r12], 0 mov qword [r12], 0
ret ret
word_main:
; push str_1
sub r12, 8
mov qword [r12], str_1
; push 7
sub r12, 8
mov qword [r12], 7
call word_dup
call word_puts
ret
section .data section .data
data_start: data_start:
str_0: db 115, 116, 114, 46, 115, 108, 0 str_0: db 115, 116, 114, 46, 115, 108, 0
str_0_len equ 6 str_0_len equ 6
str_1: db 118, 99, 120, 122, 118, 103, 103, 0
str_1_len equ 7
data_end: data_end:
section .bss section .bss
align 16 align 16

BIN
build/str.o
View File

Binary file not shown.

23
build/test_write_file.asm
View File

@@ -526,18 +526,17 @@ word_main:
; push str_0 ; push str_0
sub r12, 8 sub r12, 8
mov qword [r12], str_0 mov qword [r12], str_0
; push 22
sub r12, 8
mov qword [r12], 22
call word_swap
; push str_1
sub r12, 8
mov qword [r12], str_1
; push 27 ; push 27
sub r12, 8 sub r12, 8
mov qword [r12], 27 mov qword [r12], 27
call word_swap call word_swap
call word_2swap ; push str_1
sub r12, 8
mov qword [r12], str_1
; push 22
sub r12, 8
mov qword [r12], 22
call word_swap
call word_write_file call word_write_file
call word_dup call word_dup
; push 0 ; push 0
@@ -573,10 +572,10 @@ L_if_false_0:
ret ret
section .data section .data
data_start: data_start:
str_0: db 47, 116, 109, 112, 47, 108, 50, 95, 116, 101, 115, 116, 95, 119, 114, 105, 116, 101, 46, 116, 120, 116, 0 str_0: db 104, 101, 108, 108, 111, 32, 102, 114, 111, 109, 32, 119, 114, 105, 116, 101, 95, 102, 105, 108, 101, 32, 116, 101, 115, 116, 10, 0
str_0_len equ 22 str_0_len equ 27
str_1: db 104, 101, 108, 108, 111, 32, 102, 114, 111, 109, 32, 119, 114, 105, 116, 101, 95, 102, 105, 108, 101, 32, 116, 101, 115, 116, 10, 0 str_1: db 47, 116, 109, 112, 47, 108, 50, 95, 116, 101, 115, 116, 95, 119, 114, 105, 116, 101, 46, 116, 120, 116, 0
str_1_len equ 27 str_1_len equ 22
str_2: db 119, 114, 111, 116, 101, 32, 98, 121, 116, 101, 115, 58, 32, 0 str_2: db 119, 114, 111, 116, 101, 32, 98, 121, 116, 101, 115, 58, 32, 0
str_2_len equ 13 str_2_len equ 13
str_3: db 119, 114, 105, 116, 101, 32, 102, 97, 105, 108, 101, 100, 32, 101, 114, 114, 110, 111, 61, 0 str_3: db 119, 114, 105, 116, 101, 32, 102, 97, 105, 108, 101, 100, 32, 101, 114, 114, 110, 111, 61, 0

BIN
build/test_write_file.o
View File

Binary file not shown.

10
stdlib/stdlib.sl
View File

@@ -26,16 +26,6 @@
} }
; ;
# : strlen ( addr len -- len )
:asm strlen {
mov rax, [r12] ; addr
mov rcx, [r12 + 8] ; len
add r12, 16 ; pop len and addr
mov [r12], rcx ; push len
ret
}
;
:asm puts { :asm puts {
; detects string if top is len>=0 and next is a pointer in [data_start, data_end] ; detects string if top is len>=0 and next is a pointer in [data_start, data_end]
mov rax, [r12] ; len or int value mov rax, [r12] ; len or int value

5
test_write_file.sl
View File

@@ -2,11 +2,10 @@ import stdlib/stdlib.sl
import stdlib/io.sl import stdlib/io.sl
: main : main
"/tmp/l2_test_write.txt" # push path (len addr)
swap # -> (addr len) = path_ptr path_len
"hello from write_file test\n" # push buf (len addr) "hello from write_file test\n" # push buf (len addr)
swap # -> (addr len) = buf_ptr buf_len swap # -> (addr len) = buf_ptr buf_len
2swap # reorder pairs -> path_ptr path_len buf_ptr buf_len "/tmp/l2_test_write.txt" # push path (len addr)
swap # -> (addr len) = path_ptr path_len
write_file write_file
dup 0 > if dup 0 > if
"wrote bytes: " puts "wrote bytes: " puts

BIN
write
View File

Binary file not shown.