diff --git a/internal/cgen/builtin.go b/internal/cgen/builtin.go index dfd6f9ba..acd9681b 100644 --- a/internal/cgen/builtin.go +++ b/internal/cgen/builtin.go @@ -453,9 +453,14 @@ func (g *gen) writeBuiltinCPUArch(b *buffer, recv *a.Expr, method t.ID, args []* return g.writeBuiltinCPUArchARMNeon(b, recv, method, args, sideEffectsOnly, depth) } switch id { + case t.IDARMCRC32Utility, t.IDARMCRC32U32: + return g.writeBuiltinCPUArchARMCRC32(b, recv, method, args, sideEffectsOnly, depth) case t.IDX86SSE42Utility, t.IDX86M128I: return g.writeBuiltinCPUArchX86(b, recv, method, args, sideEffectsOnly, depth) } + return fmt.Errorf("internal error: unsupported cpu_arch method %s.%s", + recv.MType().Str(g.tm), method.Str(g.tm)) + armCRC32U32 := recv.MType().Eq(typeExprARMCRC32U32) armNeon := recv.MType().Eq(typeExprARMNeon64) || recv.MType().Eq(typeExprARMNeon128) @@ -772,6 +777,30 @@ func (g *gen) writeBuiltinCPUArch(b *buffer, recv *a.Expr, method t.ID, args []* return nil } +func (g *gen) writeBuiltinCPUArchARMCRC32(b *buffer, recv *a.Expr, method t.ID, args []*a.Node, sideEffectsOnly bool, depth uint32) error { + methodStr := method.Str(g.tm) + if methodStr == "make_u32" { + return g.writeExpr(b, args[0].AsArg().Value(), false, depth) + } else if methodStr == "value" { + return g.writeExpr(b, recv, false, depth) + } + + b.writes("__") + b.writes(methodStr) + b.writes("(") + if err := g.writeExpr(b, recv, false, depth); err != nil { + return err + } + for _, o := range args { + b.writes(", ") + if err := g.writeExpr(b, o.AsArg().Value(), false, depth); err != nil { + return err + } + } + b.writes(")") + return nil +} + func (g *gen) writeBuiltinCPUArchARMNeon(b *buffer, recv *a.Expr, method t.ID, args []*a.Node, sideEffectsOnly bool, depth uint32) error { methodStr := method.Str(g.tm) if strings.HasPrefix(methodStr, "make_") { diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index d9553da0..3f954b8d 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -556,16 +556,16 @@ var funcsOther = [...]string{ // ---- arm_crc32_utility + "arm_crc32_utility.make_u32(a: u32) arm_crc32_u32", + // ---- arm_crc32_u32 - "arm_crc32_u32.create(a: u32) arm_crc32_u32", + "arm_crc32_u32.crc32b(b: u8) arm_crc32_u32", + "arm_crc32_u32.crc32h(b: u16) arm_crc32_u32", + "arm_crc32_u32.crc32w(b: u32) arm_crc32_u32", + "arm_crc32_u32.crc32d(b: u64) arm_crc32_u32", "arm_crc32_u32.value() u32", - "arm_crc32_u32._crc32b(b: u8) arm_crc32_u32", - "arm_crc32_u32._crc32h(b: u16) arm_crc32_u32", - "arm_crc32_u32._crc32w(b: u32) arm_crc32_u32", - "arm_crc32_u32._crc32d(b: u64) arm_crc32_u32", - // ---- arm_neon_utility "arm_neon_utility.make_u8x8_multiple(" + diff --git a/std/crc32/common_up_arm_crc32.wuffs b/std/crc32/common_up_arm_crc32.wuffs index fcd5d365..11ed882b 100644 --- a/std/crc32/common_up_arm_crc32.wuffs +++ b/std/crc32/common_up_arm_crc32.wuffs @@ -15,21 +15,22 @@ pri func ieee_hasher.up_arm_crc32!(x: slice base.u8), choose cpu_arch >= arm_crc32, { - var s : base.arm_crc32_u32 - var p : slice base.u8 + var util : base.arm_crc32_utility + var s : base.arm_crc32_u32 + var p : slice base.u8 - s = s.create(a: 0xFFFF_FFFF ^ this.state) + s = util.make_u32(a: 0xFFFF_FFFF ^ this.state) // Align to a 16-byte boundary. while (args.x.length() > 0) and ((15 & args.x.uintptr_low_12_bits()) <> 0) { - s = s._crc32b(b: args.x[0]) + s = s.crc32b(b: args.x[0]) args.x = args.x[1 ..] } endwhile iterate (p = args.x)(length: 8, advance: 8, unroll: 16) { - s = s._crc32d(b: p.peek_u64le()) + s = s.crc32d(b: p.peek_u64le()) } else (length: 1, advance: 1, unroll: 1) { - s = s._crc32b(b: p[0]) + s = s.crc32b(b: p[0]) } this.state = 0xFFFF_FFFF ^ s.value()