mirror of
https://github.com/Ed94/Odin.git
synced 2026-08-05 15:18:49 +00:00
Merge branch 'master' of https://github.com/odin-lang/Odin
This commit is contained in:
+14
-8
@@ -26,12 +26,18 @@ when ODIN_NO_CRT && ODIN_OS == .Windows {
|
|||||||
return dst
|
return dst
|
||||||
}
|
}
|
||||||
} else when ODIN_NO_CRT || (ODIN_ARCH == .wasm32 || ODIN_ARCH == .wasm64p32) {
|
} else when ODIN_NO_CRT || (ODIN_ARCH == .wasm32 || ODIN_ARCH == .wasm64p32) {
|
||||||
|
// NOTE: on wasm, calls to these procs are generated (by LLVM) with type `i32` instead of `int`.
|
||||||
|
//
|
||||||
|
// NOTE: `#any_int` is also needed, because calls that we generate (and package code)
|
||||||
|
// will be using `int` and need to be converted.
|
||||||
|
int_t :: i32 when ODIN_ARCH == .wasm64p32 else int
|
||||||
|
|
||||||
@(link_name="memset", linkage="strong", require)
|
@(link_name="memset", linkage="strong", require)
|
||||||
memset :: proc "c" (ptr: rawptr, val: i32, len: int) -> rawptr {
|
memset :: proc "c" (ptr: rawptr, val: i32, #any_int len: int_t) -> rawptr {
|
||||||
if ptr != nil && len != 0 {
|
if ptr != nil && len != 0 {
|
||||||
b := byte(val)
|
b := byte(val)
|
||||||
p := ([^]byte)(ptr)
|
p := ([^]byte)(ptr)
|
||||||
for i := 0; i < len; i += 1 {
|
for i := int_t(0); i < len; i += 1 {
|
||||||
p[i] = b
|
p[i] = b
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -39,10 +45,10 @@ when ODIN_NO_CRT && ODIN_OS == .Windows {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@(link_name="bzero", linkage="strong", require)
|
@(link_name="bzero", linkage="strong", require)
|
||||||
bzero :: proc "c" (ptr: rawptr, len: int) -> rawptr {
|
bzero :: proc "c" (ptr: rawptr, #any_int len: int_t) -> rawptr {
|
||||||
if ptr != nil && len != 0 {
|
if ptr != nil && len != 0 {
|
||||||
p := ([^]byte)(ptr)
|
p := ([^]byte)(ptr)
|
||||||
for i := 0; i < len; i += 1 {
|
for i := int_t(0); i < len; i += 1 {
|
||||||
p[i] = 0
|
p[i] = 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -50,7 +56,7 @@ when ODIN_NO_CRT && ODIN_OS == .Windows {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@(link_name="memmove", linkage="strong", require)
|
@(link_name="memmove", linkage="strong", require)
|
||||||
memmove :: proc "c" (dst, src: rawptr, len: int) -> rawptr {
|
memmove :: proc "c" (dst, src: rawptr, #any_int len: int_t) -> rawptr {
|
||||||
d, s := ([^]byte)(dst), ([^]byte)(src)
|
d, s := ([^]byte)(dst), ([^]byte)(src)
|
||||||
if d == s || len == 0 {
|
if d == s || len == 0 {
|
||||||
return dst
|
return dst
|
||||||
@@ -63,7 +69,7 @@ when ODIN_NO_CRT && ODIN_OS == .Windows {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if s > d && uintptr(s)-uintptr(d) < uintptr(len) {
|
if s > d && uintptr(s)-uintptr(d) < uintptr(len) {
|
||||||
for i := 0; i < len; i += 1 {
|
for i := int_t(0); i < len; i += 1 {
|
||||||
d[i] = s[i]
|
d[i] = s[i]
|
||||||
}
|
}
|
||||||
return dst
|
return dst
|
||||||
@@ -71,10 +77,10 @@ when ODIN_NO_CRT && ODIN_OS == .Windows {
|
|||||||
return memcpy(dst, src, len)
|
return memcpy(dst, src, len)
|
||||||
}
|
}
|
||||||
@(link_name="memcpy", linkage="strong", require)
|
@(link_name="memcpy", linkage="strong", require)
|
||||||
memcpy :: proc "c" (dst, src: rawptr, len: int) -> rawptr {
|
memcpy :: proc "c" (dst, src: rawptr, #any_int len: int_t) -> rawptr {
|
||||||
d, s := ([^]byte)(dst), ([^]byte)(src)
|
d, s := ([^]byte)(dst), ([^]byte)(src)
|
||||||
if d != s {
|
if d != s {
|
||||||
for i := 0; i < len; i += 1 {
|
for i := int_t(0); i < len; i += 1 {
|
||||||
d[i] = s[i]
|
d[i] = s[i]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -487,6 +487,7 @@ connect :: proc "contextless" (sock: Fd, addr: ^$T) -> (Errno)
|
|||||||
where
|
where
|
||||||
T == Sock_Addr_In ||
|
T == Sock_Addr_In ||
|
||||||
T == Sock_Addr_In6 ||
|
T == Sock_Addr_In6 ||
|
||||||
|
T == Sock_Addr_Un ||
|
||||||
T == Sock_Addr_Any
|
T == Sock_Addr_Any
|
||||||
{
|
{
|
||||||
ret := syscall(SYS_connect, sock, addr, size_of(T))
|
ret := syscall(SYS_connect, sock, addr, size_of(T))
|
||||||
@@ -502,6 +503,7 @@ accept :: proc "contextless" (sock: Fd, addr: ^$T, sockflags: Socket_FD_Flags =
|
|||||||
where
|
where
|
||||||
T == Sock_Addr_In ||
|
T == Sock_Addr_In ||
|
||||||
T == Sock_Addr_In6 ||
|
T == Sock_Addr_In6 ||
|
||||||
|
T == Sock_Addr_Un ||
|
||||||
T == Sock_Addr_Any
|
T == Sock_Addr_Any
|
||||||
{
|
{
|
||||||
addr_len: i32 = size_of(T)
|
addr_len: i32 = size_of(T)
|
||||||
@@ -514,6 +516,7 @@ recvfrom :: proc "contextless" (sock: Fd, buf: []u8, flags: Socket_Msg, addr: ^$
|
|||||||
where
|
where
|
||||||
T == Sock_Addr_In ||
|
T == Sock_Addr_In ||
|
||||||
T == Sock_Addr_In6 ||
|
T == Sock_Addr_In6 ||
|
||||||
|
T == Sock_Addr_Un ||
|
||||||
T == Sock_Addr_Any
|
T == Sock_Addr_Any
|
||||||
{
|
{
|
||||||
addr_len: i32 = size_of(T)
|
addr_len: i32 = size_of(T)
|
||||||
@@ -531,6 +534,7 @@ sendto :: proc "contextless" (sock: Fd, buf: []u8, flags: Socket_Msg, addr: ^$T)
|
|||||||
where
|
where
|
||||||
T == Sock_Addr_In ||
|
T == Sock_Addr_In ||
|
||||||
T == Sock_Addr_In6 ||
|
T == Sock_Addr_In6 ||
|
||||||
|
T == Sock_Addr_Un ||
|
||||||
T == Sock_Addr_Any
|
T == Sock_Addr_Any
|
||||||
{
|
{
|
||||||
ret := syscall(SYS_sendto, sock, raw_data(buf), len(buf), transmute(i32) flags, addr, size_of(T))
|
ret := syscall(SYS_sendto, sock, raw_data(buf), len(buf), transmute(i32) flags, addr, size_of(T))
|
||||||
@@ -590,6 +594,7 @@ bind :: proc "contextless" (sock: Fd, addr: ^$T) -> (Errno)
|
|||||||
where
|
where
|
||||||
T == Sock_Addr_In ||
|
T == Sock_Addr_In ||
|
||||||
T == Sock_Addr_In6 ||
|
T == Sock_Addr_In6 ||
|
||||||
|
T == Sock_Addr_Un ||
|
||||||
T == Sock_Addr_Any
|
T == Sock_Addr_Any
|
||||||
{
|
{
|
||||||
ret := syscall(SYS_bind, sock, addr, size_of(T))
|
ret := syscall(SYS_bind, sock, addr, size_of(T))
|
||||||
|
|||||||
@@ -631,6 +631,14 @@ Sock_Addr_In6 :: struct #packed {
|
|||||||
sin6_scope_id: u32,
|
sin6_scope_id: u32,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Struct representing Unix Domain Socket address
|
||||||
|
*/
|
||||||
|
Sock_Addr_Un :: struct #packed {
|
||||||
|
sun_family: Address_Family,
|
||||||
|
sun_path: [108]u8,
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Struct representing an arbitrary socket address.
|
Struct representing an arbitrary socket address.
|
||||||
*/
|
*/
|
||||||
@@ -641,6 +649,7 @@ Sock_Addr_Any :: struct #raw_union {
|
|||||||
},
|
},
|
||||||
using ipv4: Sock_Addr_In,
|
using ipv4: Sock_Addr_In,
|
||||||
using ipv6: Sock_Addr_In6,
|
using ipv6: Sock_Addr_In6,
|
||||||
|
using uds: Sock_Addr_Un,
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
Reference in New Issue
Block a user