diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-04-26 14:14:14 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-05-01 13:31:17 +0200 |
| commit | e54e9781a4e043b3140b0c908ba4f4e469fd317e (patch) | |
| tree | 16e6387d78a8577c5f3d9fb8d05a51752da6338e /prog/any.go | |
| parent | 3f4dbb2f6fff9479d6c250e224bc3cb7f5cd66ed (diff) | |
prog: remove Dir from Type
Having Dir is Type is handy, but forces us to duplicate lots of types.
E.g. if a struct is referenced as both in and out, then we need to
have 2 copies and 2 copies of structs/types it includes.
If also prevents us from having the struct type as struct identity
(because we can have up to 3 of them).
Revert to the old way we used to do it: propagate Dir as we walk
syscall arguments. This moves lots of dir passing from pkg/compiler
to prog package.
Now Arg contains the dir, so once we build the tree, we can use dirs
as before.
Reduces size of sys/linux/gen/amd64.go from 6058336 to 5661150 (-6.6%).
Update #1580
Diffstat (limited to 'prog/any.go')
| -rw-r--r-- | prog/any.go | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/prog/any.go b/prog/any.go index 15ce6ec53..d1433b18d 100644 --- a/prog/any.go +++ b/prog/any.go @@ -54,7 +54,8 @@ func initAnyTypes(target *Target) { TypeSize: target.PtrSize, IsOptional: true, }, - Type: target.any.array, + Type: target.any.array, + ElemDir: DirIn, } target.any.ptr64 = &PtrType{ TypeCommon: TypeCommon{ @@ -63,7 +64,8 @@ func initAnyTypes(target *Target) { TypeSize: 8, IsOptional: true, }, - Type: target.any.array, + Type: target.any.array, + ElemDir: DirIn, } target.any.blob = &BufferType{ TypeCommon: TypeCommon{ @@ -77,7 +79,6 @@ func initAnyTypes(target *Target) { TypeCommon: TypeCommon{ TypeName: name, FldName: name, - ArgDir: DirIn, TypeSize: size, IsOptional: true, }, @@ -100,7 +101,6 @@ func initAnyTypes(target *Target) { TypeName: "ANYUNION", FldName: "ANYUNION", IsVarlen: true, - ArgDir: DirIn, }, Fields: []Type{ target.any.blob, @@ -150,7 +150,7 @@ func (p *Prog) complexPtrs() (res []*PointerArg) { } func (target *Target) isComplexPtr(arg *PointerArg) bool { - if arg.Res == nil || arg.Type().Dir() != DirIn { + if arg.Res == nil || arg.Dir() != DirIn { return false } if target.isAnyPtr(arg.Type()) { @@ -175,6 +175,15 @@ func (target *Target) isComplexPtr(arg *PointerArg) bool { return complex && !hasPtr } +func (target *Target) isAnyRes(name string) bool { + return name == target.any.res16.TypeName || + name == target.any.res32.TypeName || + name == target.any.res64.TypeName || + name == target.any.resdec.TypeName || + name == target.any.reshex.TypeName || + name == target.any.resoct.TypeName +} + func (target *Target) CallContainsAny(c *Call) (res bool) { ForeachArg(c, func(arg Arg, ctx *ArgCtx) { if target.isAnyPtr(arg.Type()) { @@ -208,7 +217,7 @@ func (target *Target) squashPtr(arg *PointerArg, preserveField bool) { field = arg.Type().FieldName() } arg.typ = target.makeAnyPtrType(arg.Type().Size(), field) - arg.Res = MakeGroupArg(arg.typ.(*PtrType).Type, elems) + arg.Res = MakeGroupArg(arg.typ.(*PtrType).Type, DirIn, elems) if size := arg.Res.Size(); size != size0 { panic(fmt.Sprintf("squash changed size %v->%v for %v", size0, size, res0.Type())) } @@ -230,7 +239,7 @@ func (target *Target) squashPtrImpl(a Arg, elems *[]Arg) { } target.squashPtrImpl(arg.Option, elems) case *DataArg: - if arg.Type().Dir() == DirOut { + if arg.Dir() == DirOut { pad = arg.Size() } else { elem := target.ensureDataElem(elems) @@ -299,7 +308,8 @@ func (target *Target) squashResult(arg *ResultArg, elems *[]Arg) { default: panic("bad") } - *elems = append(*elems, MakeUnionArg(target.any.union, arg)) + arg.dir = DirIn + *elems = append(*elems, MakeUnionArg(target.any.union, DirIn, arg)) } func (target *Target) squashGroup(arg *GroupArg, elems *[]Arg) { @@ -375,14 +385,14 @@ func (target *Target) squashedValue(arg *ConstArg) (uint64, BinaryFormat) { func (target *Target) ensureDataElem(elems *[]Arg) *DataArg { if len(*elems) == 0 { - res := MakeDataArg(target.any.blob, nil) - *elems = append(*elems, MakeUnionArg(target.any.union, res)) + res := MakeDataArg(target.any.blob, DirIn, nil) + *elems = append(*elems, MakeUnionArg(target.any.union, DirIn, res)) return res } res, ok := (*elems)[len(*elems)-1].(*UnionArg).Option.(*DataArg) if !ok { - res = MakeDataArg(target.any.blob, nil) - *elems = append(*elems, MakeUnionArg(target.any.union, res)) + res = MakeDataArg(target.any.blob, DirIn, nil) + *elems = append(*elems, MakeUnionArg(target.any.union, DirIn, res)) } return res } |
