From 62f9fa1fd41e0df112d39dc02ab27e8774a81c6a Mon Sep 17 00:00:00 2001
From: koniifer <koniifer@proton.me>
Date: Wed, 8 Jan 2025 01:25:11 +0000
Subject: [PATCH] ups
---
.../holeybytes/kernel_services/mem_serve.rs | 42 ++++++++++++++++--
sysdata/libraries/stn/src/memory.hb | 22 +++++----
.../tests/stn/assets/hello_world_and_spin.hb | 7 ---
.../tests/stn/assets/hello_world_and_spin.hbf | Bin 273 -> 0 bytes
.../test/src/tests/stn/assets/lily.axe | Bin 0 -> 6043 bytes
.../test/src/tests/stn/assets/lily.hbf | Bin 4588 -> 0 bytes
.../programs/test/src/tests/stn/process.hb | 2 +-
7 files changed, 53 insertions(+), 20 deletions(-)
delete mode 100644 sysdata/programs/test/src/tests/stn/assets/hello_world_and_spin.hb
delete mode 100644 sysdata/programs/test/src/tests/stn/assets/hello_world_and_spin.hbf
create mode 100644 sysdata/programs/test/src/tests/stn/assets/lily.axe
delete mode 100644 sysdata/programs/test/src/tests/stn/assets/lily.hbf
diff --git a/kernel/src/holeybytes/kernel_services/mem_serve.rs b/kernel/src/holeybytes/kernel_services/mem_serve.rs
index 6e39e3a..ccdedf6 100644
--- a/kernel/src/holeybytes/kernel_services/mem_serve.rs
+++ b/kernel/src/holeybytes/kernel_services/mem_serve.rs
@@ -1,6 +1,6 @@
use {
crate::holeybytes::{kernel_services::block_read, Vm},
- alloc::alloc::{alloc, dealloc},
+ alloc::alloc::{alloc, alloc_zeroed, dealloc, realloc},
core::alloc::Layout,
log::{debug, info},
};
@@ -49,8 +49,12 @@ pub fn memory_msg_handler(
match msg_type {
0 => unsafe {
let page_count = u64::from_le_bytes(msg_vec[1..9].try_into().unwrap()) as usize;
-
- let ptr = alloc(Layout::from_size_align_unchecked(page_count * 4096, 1));
+ let zeroed = msg_vec[9];
+ let ptr = if zeroed > 0 {
+ alloc_zeroed(Layout::from_size_align_unchecked(page_count * 4096, 8))
+ } else {
+ alloc(Layout::from_size_align_unchecked(page_count * 4096, 8))
+ };
log::debug!("Allocating {} pages @ {:?}", page_count, ptr);
@@ -61,11 +65,12 @@ pub fn memory_msg_handler(
let page_count = u64::from_le_bytes(msg_vec[1..9].try_into().unwrap()) as usize;
let mptr = u64::from_le_bytes(msg_vec[9..17].try_into().unwrap()) as *mut u8;
+ debug_assert!(mptr.addr() & 0xFFFF000000000000 != 0);
log::debug!("Deallocating {} pages @ {:?}", page_count, mptr);
dealloc(
mptr,
- Layout::from_size_align_unchecked(page_count * 4096, 1),
+ Layout::from_size_align_unchecked(page_count * 4096, 8),
)
},
2 => {
@@ -108,6 +113,35 @@ pub fn memory_msg_handler(
debug_assert!(dest.addr() & 0xFFFF000000000000 != 0);
memset(dest, src, count, size);
},
+ 6 => unsafe {
+ let count = u64::from_le_bytes(msg_vec[1..9].try_into().unwrap_unchecked()) as usize;
+ let src = u64::from_le_bytes(msg_vec[9..17].try_into().unwrap_unchecked()) as *const u8;
+ let dest = u64::from_le_bytes(msg_vec[17..25].try_into().unwrap_unchecked()) as *mut u8;
+ debug_assert!(src.addr() & 0xFFFF000000000000 != 0);
+ debug_assert!(dest.addr() & 0xFFFF000000000000 != 0);
+ src.copy_to(dest, count);
+ },
+ 7 => unsafe {
+ let page_count = u64::from_le_bytes(msg_vec[1..9].try_into().unwrap()) as usize;
+ let page_count_new = u64::from_le_bytes(msg_vec[9..17].try_into().unwrap()) as usize;
+ let ptr = u64::from_le_bytes(msg_vec[17..25].try_into().unwrap()) as *mut u8;
+ debug_assert!(ptr.addr() & 0xFFFF000000000000 != 0);
+ let ptr_new = realloc(
+ ptr,
+ Layout::from_size_align_unchecked(page_count * 4096, 8),
+ page_count_new * 4096,
+ );
+
+ log::debug!(
+ "Re-allocating {} (now {}) pages from {:?} to {:?}",
+ page_count,
+ page_count_new,
+ ptr,
+ ptr_new
+ );
+
+ vm.registers[1] = hbvm::value::Value(ptr_new as u64);
+ },
_ => {
log::debug!("Unknown memory service message type: {}", msg_type);
}
diff --git a/sysdata/libraries/stn/src/memory.hb b/sysdata/libraries/stn/src/memory.hb
index c6b818e..abf8554 100644
--- a/sysdata/libraries/stn/src/memory.hb
+++ b/sysdata/libraries/stn/src/memory.hb
@@ -1,6 +1,4 @@
$PAGE_SIZE := 4096
-$MAX_ALLOC := 0xFF
-$MAX_FREE := 0xFF
$uninit := fn($Expr: type): Expr {
return idk
@@ -19,18 +17,22 @@ $calc_pages := fn($Expr: type, num: uint): uint {
}
// ! will be replaced, don't get attached
-alloc := fn($Expr: type, num: uint): ^Expr {
- return @bitcast(request_page(@intcast(calc_pages(Expr, num))))
+$alloc := fn($Expr: type, num: uint): ^Expr {
+ return @bitcast(request_page(calc_pages(Expr, num * @sizeof(Expr)), false))
+}
+
+$alloc_zeroed := fn($Expr: type, num: uint): ^Expr {
+ return @bitcast(request_page(calc_pages(Expr, num * @sizeof(Expr)), true))
}
// ! stub
$free := fn($Expr: type, ptr: ^Expr, num: uint): void {
- release_page(@bitcast(ptr), @intcast(calc_pages(Expr, num)))
+ release_page(@bitcast(ptr), calc_pages(Expr, num * @sizeof(Expr)))
}
-RqPageMsg := packed struct {a: u8, count: uint}
-$request_page := fn(count: uint): ^u8 {
- return @eca(3, 2, &RqPageMsg.(0, count), @sizeof(RqPageMsg))
+RqPageMsg := packed struct {a: u8, count: uint, zeroed: bool}
+$request_page := fn(count: uint, zeroed: bool): ^u8 {
+ return @eca(3, 2, &RqPageMsg.(0, count, zeroed), @sizeof(RqPageMsg))
}
RlPageMsg := packed struct {a: u8, count: uint, ptr: ^u8}
@@ -76,4 +78,8 @@ $copy := fn($Expr: type, src: ^Expr, dest: ^Expr, count: uint): void {
SetMsg := packed struct {a: u8, count: uint, size: uint, src: ^u8, dest: ^u8}
$set := fn($Expr: type, src: ^Expr, dest: ^Expr, count: uint): void {
return @eca(3, 2, &SetMsg.(5, count, @sizeof(Expr), @bitcast(src), @bitcast(dest)), @sizeof(SetMsg))
+}
+
+$move := fn($Expr: type, src: ^Expr, dest: ^Expr, count: uint): void {
+ return @eca(3, 2, &CopyMsg.(7, count * @sizeof(Expr), @bitcast(src), @bitcast(dest)), @sizeof(CopyMsg))
}
\ No newline at end of file
diff --git a/sysdata/programs/test/src/tests/stn/assets/hello_world_and_spin.hb b/sysdata/programs/test/src/tests/stn/assets/hello_world_and_spin.hb
deleted file mode 100644
index e8d4c92..0000000
--- a/sysdata/programs/test/src/tests/stn/assets/hello_world_and_spin.hb
+++ /dev/null
@@ -1,7 +0,0 @@
-.{log, sleep} := @use("stn")
-
-main := fn(): void {
- log.info("Hello, World!")
- // fake interrupt, sleep forever
- sleep.sleep_until_interrupt(100)
-}
\ No newline at end of file
diff --git a/sysdata/programs/test/src/tests/stn/assets/hello_world_and_spin.hbf b/sysdata/programs/test/src/tests/stn/assets/hello_world_and_spin.hbf
deleted file mode 100644
index 48b140214b18d8358f18f9d8cfe6dfed8dd9f8e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 273
zcmWfgc!>cB&VmRa;Dt~)$q;!44xl8X!M}g^|3iQeFT)|AkOv==0slXkMnB$vf>1UG
zgSP<8SU*0v3PuJ$fq#;4H9!rFaE>o8sthMw#+w&rtT!J_y|(}}RNjqAz>S&DjfLNh
sl{dzNH^rNe4KBmy#>^W7bhaW?B$PoO%3|<H&B@8vQ3%g3%1KcK00VC%p#T5?
diff --git a/sysdata/programs/test/src/tests/stn/assets/lily.axe b/sysdata/programs/test/src/tests/stn/assets/lily.axe
new file mode 100644
index 0000000000000000000000000000000000000000..ff23ae1280245253d00e408a429ff4f5f2eb97b7
GIT binary patch
literal 6043
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
InPd8Y004l7g8%>k
literal 0
HcmV?d00001
diff --git a/sysdata/programs/test/src/tests/stn/assets/lily.hbf b/sysdata/programs/test/src/tests/stn/assets/lily.hbf
deleted file mode 100644
index f85d5e6914c0d2dc353f7e3a44e47e4e6592aebc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4588
zcmcgvJ&Y7p9RJVEvRR35-s~MjwD8`1>~TOd;+mikbA@@?WSt3@#XBHIO^}4dLXBWy
zVT@YPsj;D?QK<~khDvEnEQuAJlysUHmBcvf@6Eoi;p4<enBwmJ-}`@m@9xijB79#B
z)nB4`@$a60kFC%Ek3rcq7n^ze)hmq%76j{5M@^!Egh~gLqPeM=)?|+Zk}1_`^Q(Ru
zP?<IQOm)`WviCq5XubnQK^7?U=D0@N5cwLtD2TzBS~L?&Jr%|-TpzX9lOmjsc4!b9
zexQ%g&>UM~=k-0*TWx+cNUP1K_8uBt^nnXLaLETQ`@j_+FpOJ~SN)f3K5*Rv8zP%1
zU)-=aQlwjAl#&c{1nLwgoHCr&9>pn0XU_r?Z!!|N+zA)Tu&5&IsDyC+9B@iuB1*H%
z2y*3z7@>bnd;cX`(Xt7*Key>HpGy`Z4Rk_Ln+67uaa3{_VP=m3Rm{W)8CJ7KivWO^
zfi)2?k62);BHez|*x*l-NZ-jYkx?vrT<%~mOQv!*)lXf;uWH4S$@-nvNoJwUqiJgR
zRw8p+R7EB<>VUQi@jd<!Blv%o;C?KMP(Rng!vvXnRv%J7EEa+IypKSL0FO?<iGp_0
z>=+QoMPX>FQP$FGav`IU>=lUFK_oHA-6Jp!krFhLkwW_p2++r&%~bMt3>yn!2*GfV
zMnw#K(UaAnFGiwX6^2znbuOIt9hQ9|Qb={LeNm_jkGb!6L}^{K?MCUEi;_`Mz;B^U
zBd=?~rLvd8*f9cE2iDjGcG~D7W<vQ_WiPIsYBEe0G1;$PRvIS=YL$0Y>lc^x$nGb3
zOfPU0-s0QGc>?Ge&gc4Oi_^z6;X#>LZKgvMN&A&?JlC|fE0cionBrj_do^*-G6=Pt
zDR*VS+cHR08MG0HEv9a|E<WR2d{pz9pb#RN_sYWBUyf{qs#PzH=;f*bt%{=U(3$~q
zC$Od_H2WI&GRkC6^`LLsAdNIC+^{i1wpV+tEJSK=+VT@VKLdc@E4aUnAU{H7YGY@G
zod9MXm=*wGRp3dU?Z&g;_zuAtNCD>vxa|UP)Yo;}4U+<KBw26Fm<}gZ$Oiqv4N2@$
zemqPJQh&&Y<&t$#pK*4Q4Pi4`6Ive{eAs*nOgGpPEO1#epiNFkK*gNMk|$cVdCfiP
zRbY|8tu@>!J^KhWuvKV2_pp^kGVYDz*r-);%M<D{=Gp3a_Y=;_p>Jz^k|o>P`h08a
z5Vppa4z|Yh7~*F|-o=bd+nMo$2^kAfwUYNHNe_ydc2Otxh}OoNT>Ao(DQ*rpfHhBB
zV9FlX=V@ZAaLHBSl8h4B8>%XtupJO)CW|-hT49EGKvU-7?6i_fH#b4MWbdKd6AmEj
zt^kZo+RM<>15rM#3A$0<rq_<s)Px+}5;eRZCdw?>%;>P%*)%^j#Idtkbz~^8X_&`$
z(>MsI?ME`m?yuKg(NV*oHaZ+qgBt6G<BYA-01s(^pGB1Z-vEF6Z}ggfAK+iYum>@~
z)%4!TG3o#Npmu&o@=Ua&yUBCYMacwWj~difDqK^jgtspsIb@`A>Dyav&vj%FVraTT
zuHPwSO>YBtWaxSDTV&{Qs&ZktBSSk&i*m@~YhR390GUsddT3ty8m?<<6<*U&SLZ)n
z)7fHbT?}Y;4w$9uY*UW8)P5ynb{FtVIR_>8T88QpW+R?*(>re4g1PL)dJC2TgMx;l
ztDv_C8&{OdshFnPAgVGih+7%$!+NPE`3#aVJ&oau%lA<jvsXd7SgPK`sXKsk%NH#@
zr>77euV+++_uQ__>SxU-f6V8t-)A4fpI+lAmFL&BqFux6gyvC|a2MIFgti?%Ux1r8
zuc{@x*{K=F2U-|@7{*Ko7e9aE@v>b3`pZkp8_Q~Z?edJ-+@(f!>@#3)R5MS*Dp=M+
zkQioE8&R_hIKgP4QSNTE_p?UmIyBLR6@G5x*W#iM5Bv_#cFHyDl&ePT0j(w@UA27j
z&;U3&0G!(qG-H%dK{FigTYp1<tVvbYq~-!Tz#=EsTJ*+WI%~Go*RTPXhp*zwZx39>
Tx6ZwD=Jf00?3?1<)2HYkfAgyQ
diff --git a/sysdata/programs/test/src/tests/stn/process.hb b/sysdata/programs/test/src/tests/stn/process.hb
index cf3d22c..96b879b 100644
--- a/sysdata/programs/test/src/tests/stn/process.hb
+++ b/sysdata/programs/test/src/tests/stn/process.hb
@@ -1,7 +1,7 @@
.{process, log} := @use("stn")
// src: https://git.ablecorp.us/koniifer/lily
-exe := @embed("./assets/lily.hbf")
+exe := @embed("./assets/lily.axe")
test := fn(): uint {
process.spawn(@bitcast(&exe), @sizeof(@TypeOf(exe)))