From 9980a72713f95bdef6bbd649fd0525bfe1da64d5 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Fri, 11 Dec 2015 15:42:14 +0100
Subject: sys: automatically add padding to structs

---
 prog/encodingexec.go | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

(limited to 'prog/encodingexec.go')

diff --git a/prog/encodingexec.go b/prog/encodingexec.go
index 90b8ef7ea..f23d98c5d 100644
--- a/prog/encodingexec.go
+++ b/prog/encodingexec.go
@@ -10,6 +10,8 @@ const (
 	instrEOF = ^uintptr(iota)
 	instrCopyin
 	instrCopyout
+	instrSetPad
+	instrCheckPad
 )
 
 const (
@@ -53,13 +55,22 @@ func (p *Prog) SerializeForExec() []byte {
 						}
 						return
 					}
-					if arg1.Dir == DirOut || arg1.Kind == ArgData && len(arg1.Data) == 0 {
+					if arg1.Kind == ArgData && len(arg1.Data) == 0 {
 						return
 					}
-					w.write(instrCopyin)
-					w.write(physicalAddr(arg) + w.args[arg1].Offset)
-					w.writeArg(arg1)
-					instrSeq++
+					pad, padSize := arg1.IsPad()
+					if (arg1.Dir == DirIn && !pad) || (arg1.Dir == DirOut && pad) || arg1.Dir == DirInOut {
+						if pad {
+							w.write(instrSetPad)
+							w.write(physicalAddr(arg) + w.args[arg1].Offset)
+							w.write(padSize)
+						} else {
+							w.write(instrCopyin)
+							w.write(physicalAddr(arg) + w.args[arg1].Offset)
+							w.writeArg(arg1)
+						}
+						instrSeq++
+					}
 				}
 				rec(arg.Res)
 			}
@@ -74,7 +85,16 @@ func (p *Prog) SerializeForExec() []byte {
 		instrSeq++
 		// Generate copyout instructions that persist interesting return values.
 		foreachArg(c, func(arg, base *Arg, _ *[]*Arg) {
-			if len(arg.Uses) == 0 {
+			pad, padSize := arg.IsPad()
+			if pad && arg.Dir != DirIn {
+				instrSeq++
+				info := w.args[arg]
+				w.write(instrCheckPad)
+				w.write(physicalAddr(base) + info.Offset)
+				w.write(padSize)
+				return
+			}
+			if pad || len(arg.Uses) == 0 {
 				return
 			}
 			switch arg.Kind {
-- 
cgit mrf-deployment