diff options
Diffstat (limited to 'libgo/go/reflect/makefuncgo_386.go')
| -rw-r--r-- | libgo/go/reflect/makefuncgo_386.go | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/libgo/go/reflect/makefuncgo_386.go b/libgo/go/reflect/makefuncgo_386.go index 71957b61b3d..96ca430d094 100644 --- a/libgo/go/reflect/makefuncgo_386.go +++ b/libgo/go/reflect/makefuncgo_386.go @@ -14,9 +14,10 @@ import "unsafe" // registers that might hold result values. type i386Regs struct { esp uint32 - eax uint32 // Value to return in %eax. - st0 uint64 // Value to return in %st(0). - sr int32 // Set to non-zero if hidden struct pointer. + eax uint32 // Value to return in %eax. + st0 float64 // Value to return in %st(0). + sr bool // Set to true if hidden struct pointer. + sf bool // Set to true if returning float } // MakeFuncStubGo implements the 386 calling convention for MakeFunc. @@ -57,12 +58,13 @@ func MakeFuncStubGo(regs *i386Regs, c *makeFuncImpl) { in := make([]Value, 0, len(ftyp.in)) ap := uintptr(regs.esp) - regs.sr = 0 + regs.sr = false + regs.sf = false var retPtr unsafe.Pointer if retStruct { retPtr = *(*unsafe.Pointer)(unsafe.Pointer(ap)) ap += ptrSize - regs.sr = 1 + regs.sr = true } for _, rt := range ftyp.in { @@ -126,13 +128,16 @@ func MakeFuncStubGo(regs *i386Regs, c *makeFuncImpl) { v := out[0] w := v.iword() - if v.Kind() != Ptr && v.Kind() != UnsafePointer { - w = loadIword(unsafe.Pointer(w), v.typ.size) - } switch v.Kind() { - case Float32, Float64: - regs.st0 = uint64(uintptr(w)) - default: + case Ptr, UnsafePointer: regs.eax = uint32(uintptr(w)) + case Float32: + regs.st0 = float64(*(*float32)(unsafe.Pointer(w))) + regs.sf = true + case Float64: + regs.st0 = *(*float64)(unsafe.Pointer(w)) + regs.sf = true + default: + regs.eax = uint32(uintptr(loadIword(unsafe.Pointer(w), v.typ.size))) } } |