forked from AbleOS/ableos
commit checkpoint
This commit is contained in:
parent
b505622601
commit
5c4056bc5c
6
Cargo.lock
generated
6
Cargo.lock
generated
|
@ -213,12 +213,12 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hbbytecode"
|
name = "hbbytecode"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#86ca959ea3eae1cb32298e135a444820583d24a0"
|
source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#784d552c1dee2a3cfde4b83e01523d91988bb554"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hblang"
|
name = "hblang"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#86ca959ea3eae1cb32298e135a444820583d24a0"
|
source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#784d552c1dee2a3cfde4b83e01523d91988bb554"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"hashbrown",
|
"hashbrown",
|
||||||
"hbbytecode",
|
"hbbytecode",
|
||||||
|
@ -229,7 +229,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hbvm"
|
name = "hbvm"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#86ca959ea3eae1cb32298e135a444820583d24a0"
|
source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#784d552c1dee2a3cfde4b83e01523d91988bb554"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"hbbytecode",
|
"hbbytecode",
|
||||||
]
|
]
|
||||||
|
|
|
@ -485,7 +485,7 @@ fn run(release: bool, target: Target, do_accel: bool) -> Result<(), Error> {
|
||||||
#[rustfmt::skip]
|
#[rustfmt::skip]
|
||||||
com.args([
|
com.args([
|
||||||
"-M", "virt",
|
"-M", "virt",
|
||||||
"-cpu", "neoverse-n2",
|
"-cpu", "max",
|
||||||
"-device", "ramfb",
|
"-device", "ramfb",
|
||||||
"-device", "qemu-xhci",
|
"-device", "qemu-xhci",
|
||||||
"-device", "usb-kbd",
|
"-device", "usb-kbd",
|
||||||
|
|
4
sysdata/libraries/stn/src/alloc/alloc_return.hb
Normal file
4
sysdata/libraries/stn/src/alloc/alloc_return.hb
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
AllocReturn := struct {
|
||||||
|
byte_count: uint,
|
||||||
|
ptr: ?^u8,
|
||||||
|
}
|
73
sysdata/libraries/stn/src/alloc/block_alloc.hb
Normal file
73
sysdata/libraries/stn/src/alloc/block_alloc.hb
Normal file
|
@ -0,0 +1,73 @@
|
||||||
|
alloc_return := @use("alloc_return.hb")
|
||||||
|
|
||||||
|
/* the block size is 64 bytes, 64 blocks of 64 bytes.
|
||||||
|
this will very quickly lead to exhaustion of free blocks.
|
||||||
|
*/
|
||||||
|
BlockAlloc := struct {
|
||||||
|
state := uint,
|
||||||
|
ptr := ^u8,
|
||||||
|
|
||||||
|
$init := fn(): Self{
|
||||||
|
// request a kernel page
|
||||||
|
// ptr := memory.alloc(1)
|
||||||
|
return .(0, null)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// $alloc := fn(self: Self, alloc_type: Type, count: uint): alloc_return.AllocReturn {
|
||||||
|
// offset := 0
|
||||||
|
// a := 0
|
||||||
|
// loop {
|
||||||
|
// a = self.state << offset;
|
||||||
|
// // check if the `offset` bit is 1, if it is move to the next offset
|
||||||
|
// if a == 1 {
|
||||||
|
// offset += 1
|
||||||
|
// } else {
|
||||||
|
// // self it to 1 and return the ptr to the allocation
|
||||||
|
// self.state |= a
|
||||||
|
// return (ptr + (offset * 64))
|
||||||
|
// }
|
||||||
|
// // there are only 64 blocks
|
||||||
|
// if offset >= 64 {
|
||||||
|
// break;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// return null
|
||||||
|
// }
|
||||||
|
|
||||||
|
// $dealloc := fn(&self, ptr: ^u8, alloc_type: Type, count: uint): void {
|
||||||
|
// size := size_of(alloc_type)*count
|
||||||
|
// // get the size alligned to the nearest block
|
||||||
|
// rounded_size := nearest_block_size_rounded_up(size)
|
||||||
|
|
||||||
|
|
||||||
|
// state_bit_start := {
|
||||||
|
// // Do math here to figure out what starting ptr corresponds to what bit
|
||||||
|
// 3
|
||||||
|
// }
|
||||||
|
|
||||||
|
// offset := 0
|
||||||
|
|
||||||
|
// loop {
|
||||||
|
// if rounded_size > 0 {
|
||||||
|
// // set state_bit_start+offset to 0
|
||||||
|
|
||||||
|
|
||||||
|
// // at the end move to the next one
|
||||||
|
// offset += 1
|
||||||
|
// } else {
|
||||||
|
// break;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// rounded_size -= 64
|
||||||
|
// }
|
||||||
|
|
||||||
|
// return void
|
||||||
|
// }
|
||||||
|
|
||||||
|
// $deinit := fn(&self): void {
|
||||||
|
// self.state := 0
|
||||||
|
|
||||||
|
|
||||||
|
// }
|
||||||
|
}
|
22
sysdata/libraries/stn/src/alloc/fake_alloc.hb
Normal file
22
sysdata/libraries/stn/src/alloc/fake_alloc.hb
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
alloc_return := @use("alloc_return.hb")
|
||||||
|
|
||||||
|
|
||||||
|
FakeAlloc := struct {
|
||||||
|
$init := fn():Self{
|
||||||
|
return .()
|
||||||
|
}
|
||||||
|
|
||||||
|
$alloc := fn(&self, alloc_type: Type, count: uint): alloc_return.AllocReturn {
|
||||||
|
return .(0, null)
|
||||||
|
}
|
||||||
|
|
||||||
|
$dealloc := fn(&self, ptr: ^u8, alloc_type: Type, count: uint) : void{
|
||||||
|
return void
|
||||||
|
}
|
||||||
|
// Nothing to clean up here
|
||||||
|
$deinit := fn(&self): void {
|
||||||
|
return void
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
2
sysdata/libraries/stn/src/alloc/lib.hb
Normal file
2
sysdata/libraries/stn/src/alloc/lib.hb
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
// .{FakeAlloc} := @use("fake_alloc.hb")
|
||||||
|
.{BlockAlloc} := @use("block_alloc.hb")
|
25
sysdata/libraries/stn/src/alloc/main.hb
Normal file
25
sysdata/libraries/stn/src/alloc/main.hb
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
allocators := @use("alloc/alloc.hb")
|
||||||
|
|
||||||
|
AStruct := struct {
|
||||||
|
a_field: u8,
|
||||||
|
}
|
||||||
|
|
||||||
|
main := fn():void{
|
||||||
|
alloc := allocators.FakeAlloc.init()
|
||||||
|
astruct := alloc.alloc(AStruct, 2)
|
||||||
|
if astruct.ptr != null{
|
||||||
|
panic("FakeAlloc actually allocated.")
|
||||||
|
}
|
||||||
|
alloc.dealloc(astruct_ptr, AStruct, 2)
|
||||||
|
alloc.deinit()
|
||||||
|
|
||||||
|
balloc := allocators.BlockAlloc.init()
|
||||||
|
bstruct_ptr := balloc.alloc(AStruct, 2)
|
||||||
|
if bstruct_ptr == null {
|
||||||
|
panic("BlockAlloc actually didn't allocate.")
|
||||||
|
}
|
||||||
|
balloc.dealloc(bstruct_ptr, AStruct, 2)
|
||||||
|
balloc.deinit()
|
||||||
|
|
||||||
|
|
||||||
|
}
|
|
@ -1,4 +1,5 @@
|
||||||
acs := @use("acs.hb")
|
acs := @use("acs.hb")
|
||||||
|
alloc := @use("alloc/lib.hb")
|
||||||
string := @use("string.hb")
|
string := @use("string.hb")
|
||||||
log := @use("log.hb")
|
log := @use("log.hb")
|
||||||
memory := @use("memory.hb")
|
memory := @use("memory.hb")
|
||||||
|
@ -9,6 +10,7 @@ file := @use("file_io.hb")
|
||||||
dt := @use("dt.hb")
|
dt := @use("dt.hb")
|
||||||
process := @use("process.hb")
|
process := @use("process.hb")
|
||||||
|
|
||||||
|
|
||||||
panic := fn(message: ?^u8): never {
|
panic := fn(message: ?^u8): never {
|
||||||
log.error("Error: Panic Called, Message:\0")
|
log.error("Error: Panic Called, Message:\0")
|
||||||
if message == null {
|
if message == null {
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
.{example: main} := @use("./examples/text.hb")
|
.{example: main} := @use("./examples/orbit.hb")
|
|
@ -22,26 +22,26 @@ resolution = "1024x768x24"
|
||||||
|
|
||||||
[boot.limine.ableos.modules]
|
[boot.limine.ableos.modules]
|
||||||
|
|
||||||
# [boot.limine.ableos.modules.render_example]
|
[boot.limine.ableos.modules.render_example]
|
||||||
# path = "boot:///render_example.hbf"
|
path = "boot:///render_example.hbf"
|
||||||
|
|
||||||
# [boot.limine.ableos.modules.horizon]
|
# [boot.limine.ableos.modules.horizon]
|
||||||
# path = "boot:///horizon.hbf"
|
# path = "boot:///horizon.hbf"
|
||||||
|
|
||||||
[boot.limine.ableos.modules.ps2_mouse_driver]
|
# [boot.limine.ableos.modules.ps2_mouse_driver]
|
||||||
path = "boot:///ps2_mouse_driver.hbf"
|
# path = "boot:///ps2_mouse_driver.hbf"
|
||||||
|
|
||||||
# [boot.limine.ableos.modules.ps2_keyboard_driver]
|
# [boot.limine.ableos.modules.ps2_keyboard_driver]
|
||||||
# path = "boot:///ps2_keyboard_driver.hbf"
|
# path = "boot:///ps2_keyboard_driver.hbf"
|
||||||
|
|
||||||
[boot.limine.ableos.modules.sunset_client]
|
# [boot.limine.ableos.modules.sunset_client]
|
||||||
path = "boot:///sunset_client.hbf"
|
# path = "boot:///sunset_client.hbf"
|
||||||
|
|
||||||
[boot.limine.ableos.modules.sunset_client_2]
|
# [boot.limine.ableos.modules.sunset_client_2]
|
||||||
path = "boot:///sunset_client_2.hbf"
|
# path = "boot:///sunset_client_2.hbf"
|
||||||
|
|
||||||
[boot.limine.ableos.modules.sunset_server]
|
# [boot.limine.ableos.modules.sunset_server]
|
||||||
path = "boot:///sunset_server.hbf"
|
# path = "boot:///sunset_server.hbf"
|
||||||
|
|
||||||
# [boot.limine.ableos.modules.processes]
|
# [boot.limine.ableos.modules.processes]
|
||||||
# path = "boot:///processes.hbf"
|
# path = "boot:///processes.hbf"
|
||||||
|
|
Loading…
Reference in a new issue