Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for go 1.6 #10

Closed
wants to merge 3 commits into from
Closed

Support for go 1.6 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b11619d
Support for interfaces and for Go 1.6
tiborvass Feb 10, 2016
1f308e4
Fix runtime error "Go pointer to Go pointer"
bendikrof Apr 5, 2019
2d65042
Fix failure in test TestStackArguments
bendikrof Apr 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions dl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package dl
// #include <dlfcn.h>
// #include <stdlib.h>
// #cgo LDFLAGS: -ldl
// #cgo CFLAGS: -O0
import "C"

import (
Expand Down Expand Up @@ -98,7 +99,8 @@ func (d *DL) Sym(symbol string, out interface{}) error {
return errors.New("out can't be nil")
}
elem := val.Elem()
switch elem.Kind() {
typ := reflect.TypeOf(elem.Interface())
switch typ.Kind() {
case reflect.Int:
// We treat Go's int as long, since it
// varies depending on the platform bit size
Expand Down Expand Up @@ -130,7 +132,6 @@ func (d *DL) Sym(symbol string, out interface{}) error {
case reflect.Float64:
elem.SetFloat(float64(*(*float64)(handle)))
case reflect.Func:
typ := elem.Type()
tr, err := makeTrampoline(typ, handle)
if err != nil {
return err
Expand Down
20 changes: 20 additions & 0 deletions dl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package dl
import (
"os/exec"
"path/filepath"
"reflect"
"testing"
"unsafe"
)
Expand Down Expand Up @@ -175,6 +176,7 @@ func TestFunctions(t *testing.T) {
if err := dl.Sym("fill42", &fill42); err != nil {
t.Fatal(err)
}

b := make([]byte, 42)
fill42(b, int32(len(b)))
for ii, v := range b {
Expand Down Expand Up @@ -237,6 +239,24 @@ func TestReturnString(t *testing.T) {
}
}

func TestInterface(t *testing.T) {
dl := openTestLib(t)
defer dl.Close()

var square struct{ Call func(float64) float64 }

v := reflect.ValueOf(&square).Elem().Field(0)
sym := v.Interface()
if err := dl.Sym("square", &sym); err != nil {
t.Fatal(err)
}
v.Set(reflect.ValueOf(sym))

if r := square.Call(4); r != 16 {
t.Errorf("expecting square(4) = 16, got %v instead", r)
}
}

func init() {
if err := exec.Command("make", "-C", "testdata").Run(); err != nil {
panic(err)
Expand Down
25 changes: 0 additions & 25 deletions examples_test.go
View file
Open in desktop

This file was deleted.

36 changes: 18 additions & 18 deletions trampoline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func makeTrampoline(typ reflect.Type, handle unsafe.Pointer) (rFunc, error) {
}
}
count := len(in)
args := make([]unsafe.Pointer, count)
args := make([]uintptr, count)
flags := make([]C.int, count+1)
flags[count] = outFlag
for ii, v := range in {
Expand All @@ -55,70 +55,70 @@ func makeTrampoline(typ reflect.Type, handle unsafe.Pointer) (rFunc, error) {
case reflect.String:
s := C.CString(v.String())
defer C.free(unsafe.Pointer(s))
args[ii] = unsafe.Pointer(s)
args[ii] = uintptr(unsafe.Pointer(s))
flags[ii] |= C.ARG_FLAG_SIZE_PTR
case reflect.Int:
args[ii] = unsafe.Pointer(uintptr(v.Int()))
args[ii] = uintptr(v.Int())
if v.Type().Size() == 4 {
flags[ii] = C.ARG_FLAG_SIZE_32
} else {
flags[ii] = C.ARG_FLAG_SIZE_64
}
case reflect.Int8:
args[ii] = unsafe.Pointer(uintptr(v.Int()))
args[ii] = uintptr(v.Int())
flags[ii] = C.ARG_FLAG_SIZE_8
case reflect.Int16:
args[ii] = unsafe.Pointer(uintptr(v.Int()))
args[ii] = uintptr(v.Int())
flags[ii] = C.ARG_FLAG_SIZE_16
case reflect.Int32:
args[ii] = unsafe.Pointer(uintptr(v.Int()))
args[ii] = uintptr(v.Int())
flags[ii] = C.ARG_FLAG_SIZE_32
case reflect.Int64:
args[ii] = unsafe.Pointer(uintptr(v.Int()))
args[ii] = uintptr(v.Int())
flags[ii] = C.ARG_FLAG_SIZE_64
case reflect.Uint:
args[ii] = unsafe.Pointer(uintptr(v.Uint()))
args[ii] = uintptr(v.Uint())
if v.Type().Size() == 4 {
flags[ii] = C.ARG_FLAG_SIZE_32
} else {
flags[ii] = C.ARG_FLAG_SIZE_64
}
case reflect.Uint8:
args[ii] = unsafe.Pointer(uintptr(v.Uint()))
args[ii] = uintptr(v.Uint())
flags[ii] = C.ARG_FLAG_SIZE_8
case reflect.Uint16:
args[ii] = unsafe.Pointer(uintptr(v.Uint()))
args[ii] = uintptr(v.Uint())
flags[ii] = C.ARG_FLAG_SIZE_16
case reflect.Uint32:
args[ii] = unsafe.Pointer(uintptr(v.Uint()))
args[ii] = uintptr(v.Uint())
flags[ii] = C.ARG_FLAG_SIZE_32
case reflect.Uint64:
args[ii] = unsafe.Pointer(uintptr(v.Uint()))
args[ii] = uintptr(v.Uint())
flags[ii] = C.ARG_FLAG_SIZE_64
case reflect.Float32:
args[ii] = unsafe.Pointer(uintptr(math.Float32bits(float32(v.Float()))))
args[ii] = uintptr(math.Float32bits(float32(v.Float())))
flags[ii] |= C.ARG_FLAG_FLOAT | C.ARG_FLAG_SIZE_32
case reflect.Float64:
args[ii] = unsafe.Pointer(uintptr(math.Float64bits(v.Float())))
args[ii] = uintptr(math.Float64bits(v.Float()))
flags[ii] |= C.ARG_FLAG_FLOAT | C.ARG_FLAG_SIZE_64
case reflect.Ptr:
args[ii] = unsafe.Pointer(v.Pointer())
args[ii] = v.Pointer()
flags[ii] |= C.ARG_FLAG_SIZE_PTR
case reflect.Slice:
if v.Len() > 0 {
args[ii] = unsafe.Pointer(v.Index(0).UnsafeAddr())
args[ii] = v.Index(0).UnsafeAddr()
}
flags[ii] |= C.ARG_FLAG_SIZE_PTR
case reflect.Uintptr:
args[ii] = unsafe.Pointer(uintptr(v.Uint()))
args[ii] = uintptr(v.Uint())
flags[ii] |= C.ARG_FLAG_SIZE_PTR
default:
panic(fmt.Errorf("can't bind value of type %s", v.Type()))
}
}
var argp *unsafe.Pointer
if count > 0 {
argp = &args[0]
argp = (*unsafe.Pointer)(unsafe.Pointer(&args[0]))
}
var ret unsafe.Pointer
if C.call(handle, argp, &flags[0], C.int(count), &ret) != 0 {
Expand Down