1 files changed, 18 insertions, 4 deletions
diff --git a/pkg/binstruct/unmarshal.go b/pkg/binstruct/unmarshal.go
index 4810d78..ca2f4b2 100644
--- a/pkg/binstruct/unmarshal.go
+++ b/pkg/binstruct/unmarshal.go
@@ -13,6 +13,10 @@ func Unmarshal(dat []byte, dstPtr any) (int, error) {
 	if unmar, ok := dstPtr.(Unmarshaler); ok {
 		return unmar.UnmarshalBinary(dat)
 	}
+	return UnmarshalWithoutInterface(dat, dstPtr)
+}
+
+func UnmarshalWithoutInterface(dat []byte, dstPtr any) (int, error) {
 	_dstPtr := reflect.ValueOf(dstPtr)
 	if _dstPtr.Kind() != reflect.Ptr {
 		return 0, fmt.Errorf("not a pointer: %v", _dstPtr.Type())
@@ -20,9 +24,19 @@ func Unmarshal(dat []byte, dstPtr any) (int, error) {
 	dst := _dstPtr.Elem()
 
 	switch dst.Kind() {
+	case reflect.Uint8:
+		newDstPtr := reflect.New(u8Type)
+		n, err := Unmarshal(dat, newDstPtr.Interface())
+		dst.Set(newDstPtr.Elem().Convert(dst.Type()))
+		return n, err
+	case reflect.Int8:
+		newDstPtr := reflect.New(i8Type)
+		n, err := Unmarshal(dat, newDstPtr.Interface())
+		dst.Set(newDstPtr.Elem().Convert(dst.Type()))
+		return n, err
 	case reflect.Ptr:
-		elemPtr := reflect.New(dst.Type().Elem()).Interface()
-		n, err := Unmarshal(dat, elemPtr)
+		elemPtr := reflect.New(dst.Type().Elem())
+		n, err := Unmarshal(dat, elemPtr.Interface())
 		dst.Set(elemPtr.Convert(dst.Type()))
 		return n, err
 	case reflect.Array:
@@ -36,9 +50,9 @@ func Unmarshal(dat []byte, dstPtr any) (int, error) {
 		}
 		return n, nil
 	case reflect.Struct:
-		// TODO
+		return getStructHandler(dst.Type()).Unmarshal(dat, dst)
 	default:
 		panic(fmt.Errorf("type=%v does not implement binfmt.Unmarshaler and kind=%v is not a supported statically-sized kind",
-			val.Type(), val.Kind()))
+			dst.Type(), dst.Kind()))
 	}
 }