diff --git a/internal/cgen/builtin.go b/internal/cgen/builtin.go index 6ba70624..12a9e8c5 100644 --- a/internal/cgen/builtin.go +++ b/internal/cgen/builtin.go @@ -455,7 +455,18 @@ func (g *gen) writeBuiltinCPUArch(b *buffer, recv *a.Expr, method t.ID, args []* return nil } - return errNoSuchBuiltin + b.printf("%s(", method.Str(g.tm)) + if err := g.writeExpr(b, recv, depth); err != nil { + return err + } + for _, o := range args { + b.writes(", ") + if err := g.writeExpr(b, o.AsArg().Value(), depth); err != nil { + return err + } + } + b.writes(")") + return nil } func (g *gen) writeBuiltinNumType(b *buffer, recv *a.Expr, method t.ID, args []*a.Node, depth uint32) error { diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 84253fe6..cb2f7308 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -534,6 +534,9 @@ var Funcs = []string{ "sse128_i.load_u32!(a: u32)", "sse128_i.store_slice!(a: slice base.u8)", "sse128_i.truncate_u32() u32", + + // TODO: generate these methods automatically? + "sse128_i._mm_add_epi8!(b: sse128_i) sse128_i", } var Interfaces = []string{ diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index fb458790..e0b5f833 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -30972,12 +30972,9 @@ wuffs_png__decoder__filter_1_distance_4_sse128( wuffs_png__decoder* self, wuffs_base__slice_u8 a_curr) { wuffs_base__slice_u8 v_c = {0}; - uint8_t v_fa0 = 0; - uint8_t v_fa1 = 0; - uint8_t v_fa2 = 0; - uint8_t v_fa3 = 0; uint32_t v_x32 = 0; __m128i v_x128 = {0}; + __m128i v_a128 = {0}; { wuffs_base__slice_u8 i_slice_c = a_curr; @@ -30985,18 +30982,18 @@ wuffs_png__decoder__filter_1_distance_4_sse128( v_c.len = 4; uint8_t* i_end0_c = i_slice_c.ptr + ((i_slice_c.len / 4) * 4); while (v_c.ptr < i_end0_c) { + v_x32 = ((((uint32_t)(v_c.ptr[0])) << 0) | + (((uint32_t)(v_c.ptr[1])) << 8) | + (((uint32_t)(v_c.ptr[2])) << 16) | + (((uint32_t)(v_c.ptr[3])) << 24)); (v_x128 = _mm_cvtsi32_si128((int)(v_x32)), wuffs_base__make_empty_struct()); + v_x128 = _mm_add_epi8(v_x128, v_a128); + v_a128 = v_x128; v_x32 = ((uint32_t)(_mm_cvtsi128_si32(v_x128))); - if (v_x32 == 0) { - } - v_fa0 += v_c.ptr[0]; - v_c.ptr[0] = v_fa0; - v_fa1 += v_c.ptr[1]; - v_c.ptr[1] = v_fa1; - v_fa2 += v_c.ptr[2]; - v_c.ptr[2] = v_fa2; - v_fa3 += v_c.ptr[3]; - v_c.ptr[3] = v_fa3; + v_c.ptr[0] = ((uint8_t)((255 & (v_x32 >> 0)))); + v_c.ptr[1] = ((uint8_t)((255 & (v_x32 >> 8)))); + v_c.ptr[2] = ((uint8_t)((255 & (v_x32 >> 16)))); + v_c.ptr[3] = ((uint8_t)((255 & (v_x32 >> 24)))); v_c.ptr += 4; } } diff --git a/std/png/decode_filter_sse128.wuffs b/std/png/decode_filter_sse128.wuffs index c6f0b5e7..1eac9078 100644 --- a/std/png/decode_filter_sse128.wuffs +++ b/std/png/decode_filter_sse128.wuffs @@ -20,25 +20,24 @@ pri func decoder.filter_1_distance_4_sse128!(curr: slice base.u8), choose cpu_arch >= sse128, { var c : slice base.u8 - var fa0 : base.u8 - var fa1 : base.u8 - var fa2 : base.u8 - var fa3 : base.u8 var x32 : base.u32 var x128 : base.sse128_i + var a128 : base.sse128_i iterate (c = args.curr)(length: 4, advance: 4, unroll: 1) { + x32 = ((c[0] as base.u32) << 0x00) | + ((c[1] as base.u32) << 0x08) | + ((c[2] as base.u32) << 0x10) | + ((c[3] as base.u32) << 0x18) x128.load_u32!(a: x32) + + x128 = x128._mm_add_epi8!(b: a128) + a128 = x128 + x32 = x128.truncate_u32() - if x32 == 0 { - } - fa0 ~mod+= c[0] - c[0] = fa0 - fa1 ~mod+= c[1] - c[1] = fa1 - fa2 ~mod+= c[2] - c[2] = fa2 - fa3 ~mod+= c[3] - c[3] = fa3 + c[0] = (0xFF & (x32 >> 0x00)) as base.u8 + c[1] = (0xFF & (x32 >> 0x08)) as base.u8 + c[2] = (0xFF & (x32 >> 0x10)) as base.u8 + c[3] = (0xFF & (x32 >> 0x18)) as base.u8 } }