IntoTheNight/holey-bytes
1
0
Fork 0
forked from AbleOS/holey-bytes
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixing @as misbehaving

Browse source
This commit is contained in:
Jakub Doka 2024-10-24 14:08:17 +02:00
parent e65dbcfcbe
commit 9c43dafcf5
No known key found for this signature in database
GPG key ID: C6E9A89936B8C143
4 changed files with 41 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lang/README.md
View file

@ -542,14 +542,12 @@ main := fn(): int {
#### small_struct_bitcast #### small_struct_bitcast
```hb ```hb
Color := struct {r: u8, g: u8, b: u8, a: u8} Color := struct {r: u8, g: u8, b: u8, a: u8}
white := Color.(255, 255, 255, 255) white := Color.(255, 255, 255, 255)
u32_to_color := fn(v: u32): Color { u32_to_color := fn(v: u32): Color return @bitcast(v)
return @bitcast(v) u32_to_u32 := fn(v: u32): u32 return v
}
main := fn(): int { main := fn(): int {
return u32_to_color(@bitcast(white)).r return u32_to_color(@bitcast(white)).r + @as(Color, @bitcast(u32_to_u32(@bitcast(white)))).g
} }
``` ```

9
lang/src/son.rs
View file

@ -2539,7 +2539,8 @@ impl<'a> Codegen<'a> {
Expr::Directive { name: "as", args: [ty, expr], .. } => { Expr::Directive { name: "as", args: [ty, expr], .. } => {
let ty = self.ty(ty); let ty = self.ty(ty);
let ctx = Ctx::default().with_ty(ty); let ctx = Ctx::default().with_ty(ty);
let mut val = self.expr_ctx(expr, ctx)?; let mut val = self.raw_expr_ctx(expr, ctx)?;
self.strip_var(&mut val);
self.assert_ty(expr.pos(), &mut val, ty, "hinted expr"); self.assert_ty(expr.pos(), &mut val, ty, "hinted expr");
Some(val) Some(val)
} }
@ -3538,6 +3539,9 @@ impl<'a> Codegen<'a> {
if let Some(oper) = to_correct { if let Some(oper) = to_correct {
oper.ty = upcasted; oper.ty = upcasted;
if core::mem::take(&mut oper.ptr) {
oper.id = self.load_mem(oper.id, oper.ty);
}
oper.id = self.ci.nodes.new_node(upcasted, Kind::Extend, [VOID, oper.id]); oper.id = self.ci.nodes.new_node(upcasted, Kind::Extend, [VOID, oper.id]);
if matches!(op, TokenKind::Add | TokenKind::Sub) if matches!(op, TokenKind::Add | TokenKind::Sub)
&& let Some(elem) = self.tys.base_of(upcasted) && let Some(elem) = self.tys.base_of(upcasted)
@ -3586,6 +3590,9 @@ impl<'a> Codegen<'a> {
self.ty_display(upcasted) self.ty_display(upcasted)
); );
src.ty = upcasted; src.ty = upcasted;
if core::mem::take(&mut src.ptr) {
src.id = self.load_mem(src.id, src.ty);
}
src.id = self.ci.nodes.new_node(upcasted, Kind::Extend, [VOID, src.id]); src.id = self.ci.nodes.new_node(upcasted, Kind::Extend, [VOID, src.id]);
} }
true true

21
lang/tests/son_tests_returning_global_struct.txt
View file

@ -6,17 +6,16 @@ main:
ST r1, r254, 4a, 4h ST r1, r254, 4a, 4h
ADDI64 r5, r254, 0d ADDI64 r5, r254, 0d
BMC r32, r5, 4h BMC r32, r5, 4h
LD r4, r254, 3a, 1h LD r3, r254, 3a, 1h
ANDI r6, r4, 255d
LD r3, r254, 2a, 1h
ANDI r5, r3, 255d ANDI r5, r3, 255d
LD r2, r254, 1a, 1h LD r2, r254, 2a, 1h
ANDI r4, r2, 255d ANDI r4, r2, 255d
LD r2, r254, 0a, 1h LD r1, r254, 1a, 1h
ANDI r7, r2, 255d ANDI r3, r1, 255d
ADD64 r8, r4, r7 LD r2, r254, 0a, 8h
ADD64 r12, r8, r5 ADD64 r6, r2, r3
ADD64 r1, r12, r6 ADD64 r10, r6, r4
ADD64 r1, r10, r5
LD r31, r254, 8a, 16h LD r31, r254, 8a, 16h
ADDI64 r254, r254, 24d ADDI64 r254, r254, 24d
JALA r0, r31, 0a JALA r0, r31, 0a
@ -24,6 +23,6 @@ random_color:
LRA r1, r0, :white LRA r1, r0, :white
LD r1, r1, 0a, 4h LD r1, r1, 0a, 4h
JALA r0, r31, 0a JALA r0, r31, 0a
code size: 257 code size: 246
ret: 1020 ret: 764
status: Ok(()) status: Ok(())

30
lang/tests/son_tests_small_struct_bitcast.txt
View file

@ -1,15 +1,22 @@
main: main:
ADDI64 r254, r254, -12d ADDI64 r254, r254, -24d
ST r31, r254, 4a, 8h ST r31, r254, 8a, 16h
LRA r1, r0, :white LRA r1, r0, :white
LD r2, r1, 0a, 4h LD r32, r1, 0a, 4h
ADDI64 r5, r254, 0d ADDI64 r5, r254, 4d
CP r2, r32
JAL r31, r0, :u32_to_color JAL r31, r0, :u32_to_color
ST r1, r254, 4a, 4h
CP r2, r32
JAL r31, r0, :u32_to_u32
ADDI64 r12, r254, 0d
LD r11, r254, 4a, 1h
ST r1, r254, 0a, 4h ST r1, r254, 0a, 4h
LD r9, r254, 0a, 1h LD r4, r254, 1a, 1h
ANDI r1, r9, 255d ADD8 r7, r4, r11
LD r31, r254, 4a, 8h ANDI r1, r7, 255d
ADDI64 r254, r254, 12d LD r31, r254, 8a, 16h
ADDI64 r254, r254, 24d
JALA r0, r31, 0a JALA r0, r31, 0a
u32_to_color: u32_to_color:
ADDI64 r254, r254, -4d ADDI64 r254, r254, -4d
@ -18,6 +25,9 @@ u32_to_color:
LD r1, r3, 0a, 4h LD r1, r3, 0a, 4h
ADDI64 r254, r254, 4d ADDI64 r254, r254, 4d
JALA r0, r31, 0a JALA r0, r31, 0a
code size: 216 u32_to_u32:
ret: 255 CP r1, r2
JALA r0, r31, 0a
code size: 284
ret: 254
status: Ok(()) status: Ok(())