AbleOS/holey-bytes
3
3
Fork 5
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

save

Browse source
This commit is contained in:
Jakub Doka 2024-10-01 21:36:23 +02:00
parent bdc2c43773
commit 4d913462cb
No known key found for this signature in database
GPG key ID: C6E9A89936B8C143
2 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
hblang/src/codegen.rs
View file

@ -752,7 +752,7 @@ impl Codegen {
let f = Field { name: self.tys.names.intern(sf.name), ty: self.ty(&sf.ty) }; let f = Field { name: self.tys.names.intern(sf.name), ty: self.ty(&sf.ty) };
self.tys.tmp.fields.push(f); self.tys.tmp.fields.push(f);
} }
self.tys.structs.push(Struct { self.tys.ins.structs.push(Struct {
field_start: self.tys.fields.len() as _, field_start: self.tys.fields.len() as _,
explicit_alignment, explicit_alignment,
file, file,
@ -763,10 +763,10 @@ impl Codegen {
if let Some(sym) = sym { if let Some(sym) = sym {
self.tys self.tys
.syms .syms
.insert(sym, ty::Kind::Struct(self.tys.structs.len() as u32 - 1).compress()); .insert(sym, ty::Kind::Struct(self.tys.ins.structs.len() as u32 - 1).compress());
} }
self.tys.structs.len() as u32 - 1 self.tys.ins.structs.len() as u32 - 1
} }
fn expr_ctx(&mut self, expr: &Expr, mut ctx: Ctx) -> Option<Value> { fn expr_ctx(&mut self, expr: &Expr, mut ctx: Ctx) -> Option<Value> {
@ -837,13 +837,13 @@ impl Codegen {
_ = self.assert_ty(index.pos(), index_val.ty, ty::Id::INT, "subsctipt"); _ = self.assert_ty(index.pos(), index_val.ty, ty::Id::INT, "subsctipt");
if let ty::Kind::Ptr(ty) = base_val.ty.expand() { if let ty::Kind::Ptr(ty) = base_val.ty.expand() {
base_val.ty = self.tys.ptrs[ty as usize].base; base_val.ty = self.tys.ins.ptrs[ty as usize].base;
base_val.loc = base_val.loc.into_derefed(); base_val.loc = base_val.loc.into_derefed();
} }
match base_val.ty.expand() { match base_val.ty.expand() {
ty::Kind::Slice(arr) => { ty::Kind::Slice(arr) => {
let ty = self.tys.arrays[arr as usize].ty; let ty = self.tys.ins.arrays[arr as usize].ty;
let item_size = self.tys.size_of(ty); let item_size = self.tys.size_of(ty);
let Loc::Rt { derefed: true, ref mut reg, ref stack, offset } = let Loc::Rt { derefed: true, ref mut reg, ref stack, offset } =
@ -1173,7 +1173,7 @@ impl Codegen {
} }
} }
ty::Kind::Slice(arr) => { ty::Kind::Slice(arr) => {
let arr = self.tys.arrays[arr as usize]; let arr = self.tys.ins.arrays[arr as usize];
let item_size = self.tys.size_of(arr.ty); let item_size = self.tys.size_of(arr.ty);
for (i, value) in fields.iter().enumerate() { for (i, value) in fields.iter().enumerate() {
let loc = loc.as_ref().offset(i as u32 * item_size); let loc = loc.as_ref().offset(i as u32 * item_size);
@ -1204,7 +1204,7 @@ impl Codegen {
let mut tal = self.expr(target)?; let mut tal = self.expr(target)?;
if let ty::Kind::Ptr(ty) = tal.ty.expand() { if let ty::Kind::Ptr(ty) = tal.ty.expand() {
tal.ty = self.tys.ptrs[ty as usize].base; tal.ty = self.tys.ins.ptrs[ty as usize].base;
tal.loc = tal.loc.into_derefed(); tal.loc = tal.loc.into_derefed();
} }
@ -1305,7 +1305,7 @@ impl Codegen {
let val = self.expr(val)?; let val = self.expr(val)?;
match val.ty.expand() { match val.ty.expand() {
ty::Kind::Ptr(ty) => Some(Value { ty::Kind::Ptr(ty) => Some(Value {
ty: self.tys.ptrs[ty as usize].base, ty: self.tys.ins.ptrs[ty as usize].base,
loc: Loc::reg(self.loc_to_reg(val.loc, self.tys.size_of(val.ty))) loc: Loc::reg(self.loc_to_reg(val.loc, self.tys.size_of(val.ty)))
.into_derefed(), .into_derefed(),
}), }),
@ -1639,7 +1639,7 @@ impl Codegen {
if matches!(op, T::Add | T::Sub) if matches!(op, T::Add | T::Sub)
&& let ty::Kind::Ptr(ty) = ty::Kind::from_ty(ty) && let ty::Kind::Ptr(ty) = ty::Kind::from_ty(ty)
{ {
let size = self.tys.size_of(self.tys.ptrs[ty as usize].base); let size = self.tys.size_of(self.tys.ins.ptrs[ty as usize].base);
imm *= size as u64; imm *= size as u64;
} }
@ -1675,7 +1675,7 @@ impl Codegen {
let ty::Kind::Ptr(ty) = ty.expand() else { unreachable!() }; let ty::Kind::Ptr(ty) = ty.expand() else { unreachable!() };
let size = self.tys.size_of(self.tys.ptrs[ty as usize].base); let size = self.tys.size_of(self.tys.ins.ptrs[ty as usize].base);
self.ci.emit(muli64(offset, offset, size as _)); self.ci.emit(muli64(offset, offset, size as _));
} }
} }
@ -1954,7 +1954,7 @@ impl Codegen {
} }
} }
ty::Kind::Slice(arr) => { ty::Kind::Slice(arr) => {
let arr = &self.tys.arrays[arr as usize]; let arr = &self.tys.ins.arrays[arr as usize];
if arr.len == ArrayLen::MAX { if arr.len == ArrayLen::MAX {
ty = self.tys.make_array(arr.ty, field_len as _); ty = self.tys.make_array(arr.ty, field_len as _);
} else if arr.len != field_len as u32 { } else if arr.len != field_len as u32 {
@ -2521,7 +2521,7 @@ impl Codegen {
right: stru @ Expr::Struct { .. }, right: stru @ Expr::Struct { .. },
} => { } => {
let str = self.ty(stru).expand().inner(); let str = self.ty(stru).expand().inner();
self.tys.structs[str as usize].name = id; self.tys.ins.structs[str as usize].name = id;
ty::Kind::Struct(str) ty::Kind::Struct(str)
} }
Expr::BinOp { left, op: TokenKind::Decl, right } => { Expr::BinOp { left, op: TokenKind::Decl, right } => {

46
hblang/src/lib.rs
View file

@ -471,10 +471,10 @@ mod ty {
TK::Module(idx) => write!(f, "@use({:?})[{}]", self.files[idx as usize].path, idx), TK::Module(idx) => write!(f, "@use({:?})[{}]", self.files[idx as usize].path, idx),
TK::Builtin(ty) => write!(f, "{}", to_str(ty)), TK::Builtin(ty) => write!(f, "{}", to_str(ty)),
TK::Ptr(ty) => { TK::Ptr(ty) => {
write!(f, "^{}", self.rety(self.tys.ptrs[ty as usize].base)) write!(f, "^{}", self.rety(self.tys.ins.ptrs[ty as usize].base))
} }
TK::Struct(idx) => { TK::Struct(idx) => {
let record = &self.tys.structs[idx as usize]; let record = &self.tys.ins.structs[idx as usize];
if ident::is_null(record.name) { if ident::is_null(record.name) {
write!(f, "[{idx}]{{")?; write!(f, "[{idx}]{{")?;
for (i, &super::Field { name, ty }) in for (i, &super::Field { name, ty }) in
@ -494,7 +494,7 @@ mod ty {
TK::Func(idx) => write!(f, "fn{idx}"), TK::Func(idx) => write!(f, "fn{idx}"),
TK::Global(idx) => write!(f, "global{idx}"), TK::Global(idx) => write!(f, "global{idx}"),
TK::Slice(idx) => { TK::Slice(idx) => {
let array = self.tys.arrays[idx as usize]; let array = self.tys.ins.arrays[idx as usize];
match array.len { match array.len {
ArrayLen::MAX => write!(f, "[{}]", self.rety(array.ty)), ArrayLen::MAX => write!(f, "[{}]", self.rety(array.ty)),
len => write!(f, "[{}; {len}]", self.rety(array.ty)), len => write!(f, "[{}; {len}]", self.rety(array.ty)),
@ -732,9 +732,9 @@ const HEADER_SIZE: usize = core::mem::size_of::<AbleOsExecutableHeader>();
impl Types { impl Types {
fn struct_field_range(&self, strct: ty::Struct) -> Range<usize> { fn struct_field_range(&self, strct: ty::Struct) -> Range<usize> {
let start = self.structs[strct as usize].field_start as usize; let start = self.ins.structs[strct as usize].field_start as usize;
let end = self let end = self
.structs .ins.structs
.get(strct as usize + 1) .get(strct as usize + 1)
.map_or(self.fields.len(), |s| s.field_start as usize); .map_or(self.fields.len(), |s| s.field_start as usize);
start..end start..end
@ -772,7 +772,7 @@ impl Types {
.find_pattern_path(name, right, |right| self.ty(file, right, files)) .find_pattern_path(name, right, |right| self.ty(file, right, files))
.unwrap_or_else(|_| unreachable!())?; .unwrap_or_else(|_| unreachable!())?;
if let ty::Kind::Struct(s) = ty.expand() { if let ty::Kind::Struct(s) = ty.expand() {
self.structs[s as usize].name = name; self.ins.structs[s as usize].name = name;
} }
self.syms.insert(SymKey::Decl(file, name), ty); self.syms.insert(SymKey::Decl(file, name), ty);
@ -819,7 +819,7 @@ impl Types {
self.tmp.fields.push(Field { name: self.names.intern(field.name), ty }); self.tmp.fields.push(Field { name: self.names.intern(field.name), ty });
} }
self.structs.push(Struct { self.ins.structs.push(Struct {
file, file,
field_start: self.fields.len() as _, field_start: self.fields.len() as _,
explicit_alignment: packed.then_some(1), explicit_alignment: packed.then_some(1),
@ -827,7 +827,7 @@ impl Types {
}); });
self.fields.extend(self.tmp.fields.drain(prev_tmp..)); self.fields.extend(self.tmp.fields.drain(prev_tmp..));
let ty = ty::Kind::Struct(self.structs.len() as u32 - 1).compress(); let ty = ty::Kind::Struct(self.ins.structs.len() as u32 - 1).compress();
self.syms.insert(sym, ty); self.syms.insert(sym, ty);
ty ty
} }
@ -965,8 +965,8 @@ impl Types {
self.syms self.syms
.entry(SymKey::Pointer(base)) .entry(SymKey::Pointer(base))
.or_insert_with(|| { .or_insert_with(|| {
self.ptrs.push(Ptr { base }); self.ins.ptrs.push(Ptr { base });
ty::Kind::Ptr(self.ptrs.len() as u32 - 1).compress() ty::Kind::Ptr(self.ins.ptrs.len() as u32 - 1).compress()
}) })
.expand() .expand()
.inner() .inner()
@ -980,8 +980,8 @@ impl Types {
self.syms self.syms
.entry(SymKey::Array(ty, len)) .entry(SymKey::Array(ty, len))
.or_insert_with(|| { .or_insert_with(|| {
self.arrays.push(Array { ty, len }); self.ins.arrays.push(Array { ty, len });
ty::Kind::Slice(self.arrays.len() as u32 - 1).compress() ty::Kind::Slice(self.ins.arrays.len() as u32 - 1).compress()
}) })
.expand() .expand()
.inner() .inner()
@ -997,7 +997,7 @@ impl Types {
ty::Kind::Builtin(ty::I16 | ty::U16) => 2, ty::Kind::Builtin(ty::I16 | ty::U16) => 2,
ty::Kind::Builtin(ty::I8 | ty::U8 | ty::BOOL) => 1, ty::Kind::Builtin(ty::I8 | ty::U8 | ty::BOOL) => 1,
ty::Kind::Slice(arr) => { ty::Kind::Slice(arr) => {
let arr = &self.arrays[arr as usize]; let arr = &self.ins.arrays[arr as usize];
match arr.len { match arr.len {
0 => 0, 0 => 0,
ArrayLen::MAX => 16, ArrayLen::MAX => 16,
@ -1005,13 +1005,13 @@ impl Types {
} }
} }
ty::Kind::Struct(stru) => { ty::Kind::Struct(stru) => {
if self.structs[stru as usize].size.get() != 0 { if self.ins.structs[stru as usize].size.get() != 0 {
return self.structs[stru as usize].size.get(); return self.ins.structs[stru as usize].size.get();
} }
let mut oiter = OffsetIter::new(stru, self); let mut oiter = OffsetIter::new(stru, self);
while oiter.next(self).is_some() {} while oiter.next(self).is_some() {}
self.structs[stru as usize].size.set(oiter.offset); self.ins.structs[stru as usize].size.set(oiter.offset);
oiter.offset oiter.offset
} }
ty => unimplemented!("size_of: {:?}", ty), ty => unimplemented!("size_of: {:?}", ty),
@ -1021,10 +1021,10 @@ impl Types {
fn align_of(&self, ty: ty::Id) -> Size { fn align_of(&self, ty: ty::Id) -> Size {
match ty.expand() { match ty.expand() {
ty::Kind::Struct(stru) => { ty::Kind::Struct(stru) => {
if self.structs[stru as usize].align.get() != 0 { if self.ins.structs[stru as usize].align.get() != 0 {
return self.structs[stru as usize].align.get() as _; return self.ins.structs[stru as usize].align.get() as _;
} }
let align = self.structs[stru as usize].explicit_alignment.map_or_else( let align = self.ins.structs[stru as usize].explicit_alignment.map_or_else(
|| { || {
self.struct_fields(stru) self.struct_fields(stru)
.iter() .iter()
@ -1034,11 +1034,11 @@ impl Types {
}, },
|a| a as _, |a| a as _,
); );
self.structs[stru as usize].align.set(align.try_into().unwrap()); self.ins.structs[stru as usize].align.set(align.try_into().unwrap());
align align
} }
ty::Kind::Slice(arr) => { ty::Kind::Slice(arr) => {
let arr = &self.arrays[arr as usize]; let arr = &self.ins.arrays[arr as usize];
match arr.len { match arr.len {
ArrayLen::MAX => 8, ArrayLen::MAX => 8,
_ => self.align_of(arr.ty), _ => self.align_of(arr.ty),
@ -1050,7 +1050,7 @@ impl Types {
fn base_of(&self, ty: ty::Id) -> Option<ty::Id> { fn base_of(&self, ty: ty::Id) -> Option<ty::Id> {
match ty.expand() { match ty.expand() {
ty::Kind::Ptr(p) => Some(self.ptrs[p as usize].base), ty::Kind::Ptr(p) => Some(self.ins.ptrs[p as usize].base),
_ => None, _ => None,
} }
} }
@ -1081,7 +1081,7 @@ impl OffsetIter {
} }
fn next<'a>(&mut self, tys: &'a Types) -> Option<(&'a Field, Offset)> { fn next<'a>(&mut self, tys: &'a Types) -> Option<(&'a Field, Offset)> {
let stru = &tys.structs[self.strct as usize]; let stru = &tys.ins.structs[self.strct as usize];
let field = &tys.fields[self.fields.next()?]; let field = &tys.fields[self.fields.next()?];
let align = stru.explicit_alignment.map_or_else(|| tys.align_of(field.ty), |a| a as u32); let align = stru.explicit_alignment.map_or_else(|| tys.align_of(field.ty), |a| a as u32);