ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-07 16:18:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/odin-lang/Odin

Browse Source
This commit is contained in:
gingerBill
2024-09-18 00:13:44 +01:00
parent e17dfcf7a2 80cc2f5416
commit 8814170edf
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/sys/linux/sys.odin
+15 -14
View File
@@ -1443,8 +1443,9 @@ ptrace_traceme :: proc "contextless" (rq: PTrace_Traceme_Type) -> (Errno) {
} }
ptrace_peek :: proc "contextless" (rq: PTrace_Peek_Type, pid: Pid, addr: uintptr) -> (uint, Errno) { ptrace_peek :: proc "contextless" (rq: PTrace_Peek_Type, pid: Pid, addr: uintptr) -> (uint, Errno) {
ret := syscall(SYS_ptrace, rq, pid, addr) res: uint = ---
return errno_unwrap(ret, uint) ret := syscall(SYS_ptrace, rq, pid, addr, &res)
return res, Errno(-ret)
} }
ptrace_poke :: proc "contextless" (rq: PTrace_Poke_Type, pid: Pid, addr: uintptr, data: uint) -> (Errno) { ptrace_poke :: proc "contextless" (rq: PTrace_Poke_Type, pid: Pid, addr: uintptr, data: uint) -> (Errno) {
@@ -1493,12 +1494,12 @@ ptrace_setregset :: proc "contextless" (rq: PTrace_Setregset_Type, pid: Pid, not
} }
ptrace_getsiginfo :: proc "contextless" (rq: PTrace_Getsiginfo_Type, pid: Pid, si: ^Sig_Info) -> (Errno) { ptrace_getsiginfo :: proc "contextless" (rq: PTrace_Getsiginfo_Type, pid: Pid, si: ^Sig_Info) -> (Errno) {
ret := syscall(SYS_ptrace, rq, pid, si) ret := syscall(SYS_ptrace, rq, pid, si, rawptr(nil))
return Errno(-ret) return Errno(-ret)
} }
ptrace_peeksiginfo :: proc "contextless" (rq: PTrace_Peeksiginfo_Type, pid: Pid, si: ^Sig_Info) -> (Errno) { ptrace_peeksiginfo :: proc "contextless" (rq: PTrace_Peeksiginfo_Type, pid: Pid, si: ^Sig_Info) -> (Errno) {
ret := syscall(SYS_ptrace, rq, pid, si) ret := syscall(SYS_ptrace, rq, pid, si, rawptr(nil))
return Errno(-ret) return Errno(-ret)
} }
@@ -1518,52 +1519,52 @@ ptrace_setoptions :: proc "contextless" (rq: PTrace_Setoptions_Type, pid: Pid, o
} }
ptrace_geteventmsg :: proc "contextless" (rq: PTrace_Geteventmsg_Type, pid: Pid, msg: ^uint) -> (Errno) { ptrace_geteventmsg :: proc "contextless" (rq: PTrace_Geteventmsg_Type, pid: Pid, msg: ^uint) -> (Errno) {
ret := syscall(SYS_ptrace, rq, pid, msg) ret := syscall(SYS_ptrace, rq, pid, msg, rawptr(nil))
return Errno(-ret) return Errno(-ret)
} }
ptrace_cont :: proc "contextless" (rq: PTrace_Cont_Type, pid: Pid, sig: Signal) -> (Errno) { ptrace_cont :: proc "contextless" (rq: PTrace_Cont_Type, pid: Pid, sig: Signal) -> (Errno) {
ret := syscall(SYS_ptrace, rq, pid, sig) ret := syscall(SYS_ptrace, rq, pid, rawptr(nil), sig)
return Errno(-ret) return Errno(-ret)
} }
ptrace_singlestep :: proc "contextless" (rq: PTrace_Singlestep_Type, pid: Pid, sig: Signal) -> (Errno) { ptrace_singlestep :: proc "contextless" (rq: PTrace_Singlestep_Type, pid: Pid, sig: Signal) -> (Errno) {
ret := syscall(SYS_ptrace, rq, pid, sig) ret := syscall(SYS_ptrace, rq, pid, rawptr(nil), sig)
return Errno(-ret) return Errno(-ret)
} }
ptrace_syscall :: proc "contextless" (rq: PTrace_Syscall_Type, pid: Pid, sig: Signal) -> (Errno) { ptrace_syscall :: proc "contextless" (rq: PTrace_Syscall_Type, pid: Pid, sig: Signal) -> (Errno) {
ret := syscall(SYS_ptrace, rq, pid, sig) ret := syscall(SYS_ptrace, rq, pid, rawptr(nil), sig)
return Errno(-ret) return Errno(-ret)
} }
ptrace_sysemu :: proc "contextless" (rq: PTrace_Sysemu_Type, pid: Pid, sig: Signal) -> (Errno) { ptrace_sysemu :: proc "contextless" (rq: PTrace_Sysemu_Type, pid: Pid, sig: Signal) -> (Errno) {
ret := syscall(SYS_ptrace, rq, pid, sig) ret := syscall(SYS_ptrace, rq, pid, rawptr(nil), sig)
return Errno(-ret) return Errno(-ret)
} }
ptrace_sysemu_singlestep :: proc "contextless" (rq: PTrace_Sysemu_Singlestep_Type, pid: Pid, sig: Signal) -> (Errno) { ptrace_sysemu_singlestep :: proc "contextless" (rq: PTrace_Sysemu_Singlestep_Type, pid: Pid, sig: Signal) -> (Errno) {
ret := syscall(SYS_ptrace, rq, pid, sig) ret := syscall(SYS_ptrace, rq, pid, rawptr(nil), sig)
return Errno(-ret) return Errno(-ret)
} }
ptrace_listen :: proc "contextless" (rq: PTrace_Listen_Type, pid: Pid) -> (Errno) { ptrace_listen :: proc "contextless" (rq: PTrace_Listen_Type, pid: Pid) -> (Errno) {
ret := syscall(SYS_ptrace, rq, pid) ret := syscall(SYS_ptrace, rq, pid, 0, rawptr(nil))
return Errno(-ret) return Errno(-ret)
} }
ptrace_interrupt :: proc "contextless" (rq: PTrace_Interrupt_Type, pid: Pid) -> (Errno) { ptrace_interrupt :: proc "contextless" (rq: PTrace_Interrupt_Type, pid: Pid) -> (Errno) {
ret := syscall(SYS_ptrace, rq, pid) ret := syscall(SYS_ptrace, rq, pid, 0, rawptr(nil))
return Errno(-ret) return Errno(-ret)
} }
ptrace_attach :: proc "contextless" (rq: PTrace_Attach_Type, pid: Pid) -> (Errno) { ptrace_attach :: proc "contextless" (rq: PTrace_Attach_Type, pid: Pid) -> (Errno) {
ret := syscall(SYS_ptrace, rq, pid) ret := syscall(SYS_ptrace, rq, pid, 0, rawptr(nil))
return Errno(-ret) return Errno(-ret)
} }
ptrace_seize :: proc "contextless" (rq: PTrace_Seize_Type, pid: Pid, opt: PTrace_Options) -> (Errno) { ptrace_seize :: proc "contextless" (rq: PTrace_Seize_Type, pid: Pid, opt: PTrace_Options) -> (Errno) {
ret := syscall(SYS_ptrace, rq, pid, 0, transmute(u32) opt) ret := syscall(SYS_ptrace, rq, pid, 0, transmute(u32) opt, rawptr(nil))
return Errno(-ret) return Errno(-ret)
} }
tests/core/sys/posix/structs.odin
+1 -1
View File
@@ -63,7 +63,7 @@ execute_struct_checks :: proc(t: ^testing.T) {
waiting: for { waiting: for {
status: i32 status: i32
wpid := posix.waitpid(pid, &status, {}) wpid := posix.waitpid(pid, &status, {})
if status == posix.EINTR { if wpid == -1 && posix.errno() == .EINTR {
continue continue
} }
if !testing.expectf(t, wpid != -1, "waitpid() failure: %v", posix.strerror()) { if !testing.expectf(t, wpid != -1, "waitpid() failure: %v", posix.strerror()) {