aboutsummaryrefslogtreecommitdiffstats
path: root/sys/linux/init_alg.go
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2020-05-01 17:19:27 +0200
committerDmitry Vyukov <dvyukov@google.com>2020-05-02 12:16:06 +0200
commit58da4c35b15200b7279f18ea15bc8644618aae78 (patch)
tree412d59572c980c4eb582d6d0e187eb6ec32345c9 /sys/linux/init_alg.go
parentbc734e7ada413654f1b7d948b2a857260a52dd9c (diff)
prog: introduce Field type
Remvoe FieldName from Type and add a separate Field type that holds field name. Use Field for struct fields, union options and syscalls arguments, only these really have names. Reduces size of sys/linux/gen/amd64.go from 5665583 to 5201321 (-8.2%). Allows to not create new type for squashed any pointer. But main advantages will follow, e.g. removing StructDesc, using TypeRef in Arg, etc. Update #1580
Diffstat (limited to 'sys/linux/init_alg.go')
-rw-r--r--sys/linux/init_alg.go20
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/linux/init_alg.go b/sys/linux/init_alg.go
index 0e6e13fac..dc2906ef7 100644
--- a/sys/linux/init_alg.go
+++ b/sys/linux/init_alg.go
@@ -12,25 +12,25 @@ import (
func (arch *arch) generateSockaddrAlg(g *prog.Gen, typ0 prog.Type, dir prog.Dir, old prog.Arg) (
arg prog.Arg, calls []*prog.Call) {
typ := typ0.(*prog.StructType)
- family := g.GenerateArg(typ.Fields[0], dir, &calls)
+ family := g.GenerateArg(typ.Fields[0].Type, dir, &calls)
// There is very little point in generating feat/mask,
// because that can only fail otherwise correct bind.
- feat := prog.MakeConstArg(typ.Fields[2], dir, 0)
- mask := prog.MakeConstArg(typ.Fields[3], dir, 0)
+ feat := prog.MakeConstArg(typ.Fields[2].Type, dir, 0)
+ mask := prog.MakeConstArg(typ.Fields[3].Type, dir, 0)
if g.NOutOf(1, 1000) {
- feat = g.GenerateArg(typ.Fields[2], dir, &calls).(*prog.ConstArg)
- mask = g.GenerateArg(typ.Fields[3], dir, &calls).(*prog.ConstArg)
+ feat = g.GenerateArg(typ.Fields[2].Type, dir, &calls).(*prog.ConstArg)
+ mask = g.GenerateArg(typ.Fields[3].Type, dir, &calls).(*prog.ConstArg)
}
algType, algName := generateAlgName(g.Rand())
// Extend/truncate type/name to their fixed sizes.
- algTypeData := fixedSizeData(algType, typ.Fields[1].Size())
- algNameData := fixedSizeData(algName, typ.Fields[4].Size())
+ algTypeData := fixedSizeData(algType, typ.Fields[1].Type.Size())
+ algNameData := fixedSizeData(algName, typ.Fields[4].Type.Size())
arg = prog.MakeGroupArg(typ, dir, []prog.Arg{
family,
- prog.MakeDataArg(typ.Fields[1], dir, algTypeData),
+ prog.MakeDataArg(typ.Fields[1].Type, dir, algTypeData),
feat,
mask,
- prog.MakeDataArg(typ.Fields[4], dir, algNameData),
+ prog.MakeDataArg(typ.Fields[4].Type, dir, algNameData),
})
return
}
@@ -61,7 +61,7 @@ func generateAlgNameStruct(g *prog.Gen, typ0 prog.Type, dir prog.Dir, algTyp int
algName := generateAlg(g.Rand(), algTyp)
algNameData := fixedSizeData(algName, typ.Fields[0].Size())
arg = prog.MakeGroupArg(typ, dir, []prog.Arg{
- prog.MakeDataArg(typ.Fields[0], dir, algNameData),
+ prog.MakeDataArg(typ.Fields[0].Type, dir, algNameData),
})
return
}