slon-project/slon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: slon-project:5c0c9814654b1999da1e487f5629d0f224d090b0
Branches Tags
slon-project:master
..
compare: slon-project:b22e40248d2ed64de56f5a844d8b4fdab9ff3920
Branches Tags
slon-project:master

No commits in common. "5c0c9814654b1999da1e487f5629d0f224d090b0" and "b22e40248d2ed64de56f5a844d8b4fdab9ff3920" have entirely different histories.
5c0c981465 ... b22e40248d

4 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
System/Api/Tcp.HC
View file

@ -25,9 +25,12 @@ class TcpSocket {
U64 send_buffer_filled; U64 send_buffer_filled;
U64 send_buffer_kick; // We set this to 1 when we have data available to net, U64 send_buffer_kick; // We set this to 1 when we have data available to net,
// Net sets back to 0 when ready to receive // Net sets back to 0 when ready to receive
U0 (*close)(); U0(*close)
U64 (*receive)(U64 buf, U64 length); ();
U0 (*send)(U64 buf, U64 length); U64(*receive)
(U64 buf, U64 length);
U0(*send)
(U64 buf, U64 length);
}; };
class TcpBind { class TcpBind {

3
System/FFI/ELF64.HC
View file

@ -76,7 +76,8 @@ class Elf {
I64 symtab_size; I64 symtab_size;
}; };
U0 (*_start)(); U0(*_start)
();
U0 unimplemented_symbol() U0 unimplemented_symbol()
{ {

3
System/Libraries/String.HC
View file

@ -149,7 +149,8 @@ U0 @string_trim(U8* s, U8 ch = NULL, I64 mode = TRIM_BOTH)
class @string class @string
{ {
U0 (*Append)(U8* dst, U8* fmt, ...); U0(*Append)
(U8 * dst, U8 * fmt, ...);
Bool (*BeginsWith)(U8* fragment, U8* str); Bool (*BeginsWith)(U8* fragment, U8* str);
Bool (*EndsWith)(U8* fragment, U8* str); Bool (*EndsWith)(U8* fragment, U8* str);
Bool (*IsNumber)(U8* s); Bool (*IsNumber)(U8* s);

10
scripts/build-all
View file

@ -1,4 +1,4 @@
#!/usr/bin/python3 -u #!/usr/bin/python3
from pathlib import Path from pathlib import Path
import glob import glob
import os import os
@ -22,9 +22,9 @@ jakt_runtime_path = home_path + 'cloned/jakt/runtime'
jakt_lib_path = home_path + 'cloned/jakt/build/lib/x86_64-unknown-linux-unknown/' jakt_lib_path = home_path + 'cloned/jakt/build/lib/x86_64-unknown-linux-unknown/'
qemu_slipstream_iso_file = project_path + 'build/isoc/bootable.iso' qemu_slipstream_iso_file = project_path + 'build/isoc/bootable.iso'
qemu_virtio_disk_path = home_path + 'slon/virtio-disk.qcow2' qemu_virtio_disk_path = home_path + 'virtio-disk.qcow2'
qemu_bin_path = "qemu-system-x86_64" qemu_bin_path = home_path + "/Programs/qemu-9.1.2/build/qemu-system-x86_64"
qemu_display = "-display sdl,grab-mod=rctrl" qemu_display = "-display sdl,grab-mod=rctrl"
templeos_iso_file = home_path + 'iso/TempleOS.ISO' templeos_iso_file = home_path + 'iso/TempleOS.ISO'
@ -84,7 +84,7 @@ def transpile_net_to_sepples():
def build_net(): def build_net():
print("build-all: build-net") print("build-all: build-net")
build_specific_options = '-Wno-invalid-offsetof -Wl,--section-start=.text=0x1404000 -Wl,--section-start=.plt=0x1402020 -no-pie' build_specific_options = '-Wno-invalid-offsetof -Wl,--section-start=.text=0x1404000 -Wl,--section-start=.plt=0x1402020 -no-pie'
res = os.system('cd ' + project_path + 'build/net && clang++-20 ' + build_specific_options + ' -O3 -I ' + jakt_runtime_path + ' -I ' + project_path + '/src/libtemple -fcolor-diagnostics -std=c++20 -fno-exceptions -Wno-user-defined-literals -Wno-deprecated-declarations -Wno-parentheses-equality -Wno-unqualified-std-cast-call -Wno-unknown-warning-option -Wno-int-to-pointer-cast -mno-red-zone -o ../bin/net *.cpp ../lib/libtemple.so ' + jakt_lib_path + 'libjakt_runtime_x86_64-unknown-linux-unknown.a ' + jakt_lib_path + 'libjakt_main_x86_64-unknown-linux-unknown.a && cd .. && rm -rf net') res = os.system('cd ' + project_path + 'build/net && clang++-19 ' + build_specific_options + ' -O3 -I ' + jakt_runtime_path + ' -I ' + project_path + '/src/libtemple -fcolor-diagnostics -std=c++20 -fno-exceptions -Wno-user-defined-literals -Wno-deprecated-declarations -Wno-parentheses-equality -Wno-unqualified-std-cast-call -Wno-unknown-warning-option -Wno-int-to-pointer-cast -mno-red-zone -o ../bin/net *.cpp ../lib/libtemple.so ' + jakt_lib_path + 'libjakt_runtime_x86_64-unknown-linux-unknown.a ' + jakt_lib_path + 'libjakt_main_x86_64-unknown-linux-unknown.a && cd .. && rm -rf net')
if res: if res:
raise ValueError("build-all: step 'build-net' failed, error code " + str(res)) raise ValueError("build-all: step 'build-net' failed, error code " + str(res))
@ -199,4 +199,4 @@ def build_all():
generate_slipstream_iso_file() generate_slipstream_iso_file()
run() run()
build_all() build_all()