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

rewritten 'sh' inside nob.sl from asm to l2 code, renamed strcpy to memcpy and put it in mem.sl

Browse Source
This commit is contained in:
IgorCielniak
2026-01-11 19:26:39 +01:00
parent 8139aa66d9
commit 77594f45f4
4 changed files with 151 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

241
nob.sl
View File

@@ -1,127 +1,126 @@
# Minimal nob-style helper: run a shell command via /bin/sh -c import stdlib/stdlib.sl
import stdlib/linux.sl
import stdlib/mem.sl
# : sh ( cmd_addr cmd_len -- exit_code ) # sh ( cmd_addr cmd_len -- exit_code | neg_errno )
# Runs `/bin/sh -c <cmd>` and returns a waitpid-style exit code word sh
# (WIFEXITED ? status>>8 : 128+signal). Returns neg errno on fork/exec failure. swap
:asm sh { >r # save cmd_addr
; stack: cmd_len (TOS), cmd_addr (NOS) >r # save cmd_len
push r15 ; preserve callee-saved
push r14
push r13
push rbx
mov rbx, [r12] ; len r@ 1 +
mov r13, [r12 + 8] ; addr (preserve across syscalls) dup >r # stash len+1 for munmap
add r12, 16 ; pop args alloc
dup 0 < if
rdrop
rdrop
rdrop
else
dup >r # remember buffer pointer
drop
mov r14, rbx ; len 3 rpick # src addr
inc r14 ; size = len + 1 0 rpick # dst addr
swap
2 rpick # len
memcpy
; mmap buffer for C-string command 0 rpick
mov rax, 9 ; mmap 2 rpick
xor rdi, rdi ; NULL addr +
mov rsi, r14 ; size 0
mov rdx, 3 ; PROT_READ | PROT_WRITE c!
mov r10, 34 ; MAP_PRIVATE | MAP_ANON
mov r8, -1 ; fd = -1
xor r9, r9 ; offset = 0
syscall
cmp rax, -4095
jae .mmap_fail
mov r15, rax ; cmd buffer
; copy cmd into buffer and add NUL "/bin/sh" drop
mov rcx, rbx ; len 0
mov rdi, r15 ; dst mem +
mov rsi, r13 ; src !
rep movsb "-c" drop
mov byte [r15 + rbx], 0 8
mem +
!
0 rpick
16
mem +
!
0
24
mem +
!
0
32
mem +
!
; fork syscall.fork
mov rax, 57 ; fork syscall
syscall dup 0 < if
cmp rax, 0 >r
jl .fork_fail 1 rpick
cmp rax, 0 2 rpick
jne .parent free
r>
.child: rdrop
; child: argv = "/bin/sh" "-c" cmd NULL rdrop
sub rsp, 56 rdrop
lea rbx, [rel .sh_path] rdrop
mov [rsp], rbx ; argv[0] else
lea rbx, [rel .dash_c] dup 0 == if
mov [rsp + 8], rbx ; argv[1] drop
mov [rsp + 16], r15 ; argv[2] "/bin/sh" drop
mov qword [rsp + 24], 0 ; argv[3] = NULL mem
lea rsi, [rsp] ; argv dup
mov qword [rsp + 32], 0 ; envp[0] = NULL 32 +
lea rdx, [rsp + 32] ; envp syscall.execve
lea rdi, [rel .sh_path] ; filename syscall
mov rax, 59 ; execve drop
syscall 127
mov rdi, 127 syscall.exit
mov rax, 60 ; exit syscall
syscall else
mem
.parent: 40 +
; rax holds child pid dup >r
mov rbx, rax ; child pid 0
sub rsp, 8 0
lea rsi, [rsp] ; status* syscall.wait4
xor rdx, rdx ; options = 0 syscall
xor r10, r10 ; rusage = NULL dup 0 < if
mov rdi, rbx ; pid >r
mov rax, 61 ; wait4 rdrop
syscall 1 rpick
mov eax, [rsp] 2 rpick
add rsp, 8 free
r>
; decode exit status: if signaled -> 128+signal, else (status >> 8) & 0xff rdrop
mov ebx, eax rdrop
and ebx, 0x7f rdrop
cmp ebx, 0 rdrop
jne .got_signal else
shr eax, 8 drop
and eax, 0xff 0 rpick
jmp .status_ready @
.got_signal: rdrop
mov eax, ebx dup
add eax, 128 128 %
.status_ready: dup 0 != if
mov edi, eax ; save for return after unmap swap drop
128 +
; munmap command buffer else
mov rax, 11 ; munmap drop
mov rdi, r15 ; addr 256 /
mov rsi, r14 ; size end
syscall >r
1 rpick
mov eax, edi 2 rpick
sub r12, 8 free
mov [r12], rax r>
pop rbx rdrop
pop r13 rdrop
pop r14 rdrop
pop r15 rdrop
ret end
end
.fork_fail: end
mov rax, rax ; rax holds neg errno end
jmp .cleanup_return end
.mmap_fail:
mov rax, -12 ; -ENOMEM
.cleanup_return:
sub r12, 8
mov [r12], rax
pop rbx
pop r13
pop r14
pop r15
ret
.sh_path: db "/bin/sh", 0
.dash_c: db "-c", 0
}
;

2
nob_test.sl
View File

@@ -1,5 +1,5 @@
import nob.sl import nob.sl
word main word main
"echo gg" sh "ls" sh
end end

27
stdlib/mem.sl
View File

@@ -12,4 +12,31 @@ end
word free word free
munmap drop munmap drop
end
word memcpy #(dst_addr src_addr len -- dst_addr len)
dup
>r
swap
dup c@
3 pick swap
c!
drop
swap
for
1 + dup
c@
swap
-rot
swap
1 +
dup
rot
c!
drop
swap
end
swap
nip
r> dup -rot - swap
end end

46
strconcat.sl
View File

@@ -1,4 +1,5 @@
import stdlib/stdlib.sl import stdlib/stdlib.sl
import stdlib/mem.sl
import stdlib/io.sl import stdlib/io.sl
word strconcat word strconcat
@@ -9,11 +10,11 @@ word strconcat
alloc alloc
r> r> r> r>
dup >r dup >r
strcpy memcpy
swap swap
r> dup -rot + r> dup -rot +
r> r> r> r>
strcpy memcpy
swap swap
3 pick 3 pick
- -
@@ -27,47 +28,6 @@ word strconcat
rdrop rdrop rdrop rdrop rdrop rdrop
end end
word alloc
0 # addr hint (NULL)
swap # size
3 # prot (PROT_READ | PROT_WRITE)
34 # flags (MAP_PRIVATE | MAP_ANON)
-1 # fd
0 # offset
mmap
end
word free
munmap drop
end
word strcpy #(dst_addr src_addr len -- dst_addr len)
dup
>r
swap
dup c@
3 pick swap
c!
drop
swap
for
1 + dup
c@
swap
-rot
swap
1 +
dup
rot
c!
drop
swap
end
swap
nip
r> dup -rot - swap
end
word main word main
"hello world hello world hello " "world hello world hello world" "hello world hello world hello " "world hello world hello world"
strconcat strconcat