funky/ableos
1
0
Fork 0
forked from AbleOS/ableos
Code Pull requests Activity

sorta alloc support. Compiler error checkpoint

Browse source
This commit is contained in:
Able 2024-11-24 11:03:06 -06:00
parent 5ea3ee9fe1
commit 6f82c92c30
4 changed files with 90 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
sysdata/libraries/stn/src/alloc/block_alloc.hb
View file

@ -1,75 +1,74 @@
.{log} := @use("../lib.hb")
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 {
// hi
state: uint,
ptr: ?^u8,
$init := fn(): Self {
return .(0, null)
}
$alloc := fn(self: Self, alloc_type: type, count: uint): alloc_return.AllocReturn {
offset := 1
a := 1
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
log.info("Already Allocated\0")
} else {
// self it to 1 and return the ptr to the allocation
self.state |= a
// return ptr + offset * 64
return .(64, self.ptr + offset * 64)
}
// there are only 64 blocks
if offset >= 64 {
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: Self, ptr: ^u8, alloc_type: type, count: uint): void {
// size := size_of(alloc_type)*count
size := 64
// get the size alligned to the nearest block
// rounded_size := nearest_block_size_rounded_up(size)
rounded_size := 64
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: Self): void {
self.state = 0
self.ptr = null
}
}
// request a kernel page
// ptr := memory.alloc(1)
// $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
// }
// }

5
sysdata/libraries/stn/src/alloc/fake_alloc.hb
View file

@ -1,6 +1,5 @@
alloc_return := @use("alloc_return.hb")
FakeAlloc := struct {
$init := fn(): Self {
return .()
@ -10,7 +9,7 @@ FakeAlloc := struct {
return .(0, null)
}
$dealloc := fn(self: Self, ptr: ^u8, alloc_type: Type, count: uint) : void{
$dealloc := fn(self: Self, ptr: ^u8, alloc_type: type, count: uint): void {
return void
}
// Nothing to clean up here
@ -18,5 +17,3 @@ FakeAlloc := struct {
return void
}
}

21
sysdata/programs/alloc_test/src/main.hb
View file

@ -1,24 +1,27 @@
stn := @use("../../../libraries/stn/src/lib.hb");
.{allocators, panic} := stn
.{allocators, panic, log} := stn
AStruct := struct {
a_field: u8,
}
main := fn(): void {
alloc := allocators.FakeAlloc.init()
astruct := alloc.alloc(AStruct, 2)
// alloc := allocators.FakeAlloc.init()
// astruct := alloc.alloc(AStruct, 2)
// if astruct.ptr != null{
// panic.panic("FakeAlloc actually allocated.")
// }
// alloc.dealloc(&astruct.ptr, AStruct, 2)
alloc.deinit()
// alloc.deinit()
// balloc := allocators.BlockAlloc.init()
// bstruct_ptr := balloc.alloc(AStruct, 2)
// if bstruct_ptr == null {
// panic("BlockAlloc actually didn't allocate.")
// }
balloc := allocators.BlockAlloc.init()
bstruct := balloc.alloc(AStruct, 2)
if bstruct.ptr == null {
log.info("Hi\0")
// panic.panic("BlockAlloc actually didn't allocate.")
} else {
log.info("Allocator functioned.\0")
}
// balloc.dealloc(bstruct_ptr, AStruct, 2)
// balloc.deinit()
return

4
sysdata/system_config.toml
View file

@ -46,5 +46,5 @@ resolution = "1024x768x24"
# [boot.limine.ableos.modules.processes]
# path = "boot:///processes.hbf"
# [boot.limine.ableos.modules.alloc_test]
# path = "boot:///alloc_test.hbf"
[boot.limine.ableos.modules.alloc_test]
path = "boot:///alloc_test.hbf"