Support version 10.1

Author: mooncat-greenpy

src/main/java/golanganalyzerextension/FunctionModifier.java

@@ -8,6 +8,7 @@
 import ghidra.program.model.address.Address;
 import ghidra.program.model.data.DataType;
 import ghidra.program.model.data.PointerDataType;
+import ghidra.program.model.data.VoidDataType;
 import ghidra.program.model.lang.Register;
 import ghidra.program.model.listing.Function;
 import ghidra.program.model.listing.Instruction;
@@ -543,7 +544,7 @@ void modify_func_param(GolangFunction gofunc) {
 
 		try {
 			func.updateFunction(null, null, new_params, FunctionUpdateType.CUSTOM_STORAGE, true, SourceType.USER_DEFINED);
-			func.setReturnType(DataType.VOID, SourceType.USER_DEFINED);
+			func.setReturnType(new VoidDataType(), SourceType.USER_DEFINED);
 		}catch(Exception e) {
 			append_message(String.format("Failed to set function parameters: %s", e.getMessage()));
 		}

src/main/java/golanganalyzerextension/StructureManager.java

@@ -129,7 +129,7 @@ class ChanTypeInfo extends BasicTypeInfo {
 		public DataType get_datatype() {
 			// runtime/chan.go
 			StructureDataType hchan_datatype=new StructureDataType(name, 0);
-			hchan_datatype.setMinimumAlignment(pointer_size);
+			hchan_datatype.setExplicitMinimumAlignment(pointer_size);
 			hchan_datatype.add(get_datatype_by_name("uint"), "qcount", "");
 			hchan_datatype.add(get_datatype_by_name("uint"), "dataqsiz", "");
 			hchan_datatype.add(get_datatype_by_name("unsafe.Pointer"), "buf", "");
@@ -171,7 +171,7 @@ class InterfaceTypeInfo extends BasicTypeInfo {
 		public DataType get_datatype() {
 			// runtime/iface.go
 			StructureDataType interface_datatype=new StructureDataType(name, 0);
-			interface_datatype.setMinimumAlignment(pointer_size);
+			interface_datatype.setExplicitMinimumAlignment(pointer_size);
 			interface_datatype.add(new PointerDataType(get_datatype_by_name("_type")), "tab", "");
 			interface_datatype.add(new PointerDataType(), "data", "");
 			return interface_datatype;
@@ -188,7 +188,7 @@ class MapTypeInfo extends BasicTypeInfo {
 		public DataType get_datatype() {
 			// runtime/map.go
 			StructureDataType hmap_datatype=new StructureDataType(name, 0);
-			hmap_datatype.setMinimumAlignment(pointer_size);
+			hmap_datatype.setExplicitMinimumAlignment(pointer_size);
 			hmap_datatype.add(get_datatype_by_name("int"), "count", "");
 			hmap_datatype.add(get_datatype_by_name("uint8"), "flags", "");
 			hmap_datatype.add(get_datatype_by_name("uint8"), "B", "");
@@ -242,7 +242,7 @@ public DataType get_datatype(boolean once) {
 			}
 			// cmd/cgo/out.go
 			StructureDataType slice_datatype=new StructureDataType(name, 0);
-			slice_datatype.setMinimumAlignment(pointer_size);
+			slice_datatype.setExplicitMinimumAlignment(pointer_size);
 			slice_datatype.add(new PointerDataType(inner_datatype, pointer_size), "__values", null);
 			slice_datatype.add(get_datatype_by_name("uintptr"), "__count", null);
 			slice_datatype.add(get_datatype_by_name("uintptr"), "__capacity", null);
@@ -263,7 +263,7 @@ class StructTypeInfo extends BasicTypeInfo {
 		}
 		public DataType get_datatype() {
 			StructureDataType structure_datatype=new StructureDataType(name, 0);
-			structure_datatype.setMinimumAlignment(field_alignment);
+			structure_datatype.setExplicitMinimumAlignment(field_alignment);
 			for(int i=0;i<field_name_list.size();i++) {
 				long field_key=field_type_key_list.get(i);
 				DataType field_datatype=new PointerDataType(new VoidDataType(), field_alignment);
@@ -353,7 +353,7 @@ DataType get_datatype_by_name(String name) {
 	boolean init_basig_golang_hardcode_datatype() {
 		// reflect/type.go
 		StructureDataType _type_datatype=new StructureDataType("_type", 0);
-		_type_datatype.setMinimumAlignment(pointer_size);
+		_type_datatype.setExplicitMinimumAlignment(pointer_size);
 		_type_datatype.add(new PointerDataType(), "size", "");
 		_type_datatype.add(new PointerDataType(), "ptrdata", "");
 		_type_datatype.add(new UnsignedIntegerDataType(), "hash", "");
@@ -369,14 +369,14 @@ boolean init_basig_golang_hardcode_datatype() {
 
 		// runtime/chan.go
 		StructureDataType waitq_datatype=new StructureDataType("waitq", 0);
-		waitq_datatype.setMinimumAlignment(pointer_size);
+		waitq_datatype.setExplicitMinimumAlignment(pointer_size);
 		waitq_datatype.add(new PointerDataType(), "first", "");
 		waitq_datatype.add(new PointerDataType(), "last", "");
 		hardcode_datatype_map.put("waitq", waitq_datatype);
 
 		// runtime/runtime2.go
 		StructureDataType mutex_datatype=new StructureDataType("mutex", 0);
-		mutex_datatype.setMinimumAlignment(pointer_size);
+		mutex_datatype.setExplicitMinimumAlignment(pointer_size);
 		// lockRankStruct
 		mutex_datatype.add(new PointerDataType(), "key", "");
 		hardcode_datatype_map.put("mutex", mutex_datatype);
@@ -638,13 +638,13 @@ boolean analyze_type(Address type_base_addr, long offset, boolean is_go16) {
 			basic_type_info_map.replace(offset, new OtherTypeInfo(basic_info, new Float8DataType()));
 		}else if(basic_info.kind==Kind.Complex64) {
 			StructureDataType complex64_datatype=new StructureDataType("complex64", 0);
-			complex64_datatype.setMinimumAlignment(basic_info.align);
+			complex64_datatype.setExplicitMinimumAlignment(basic_info.align);
 			complex64_datatype.add(new Float4DataType(), "re", null);
 			complex64_datatype.add(new Float4DataType(), "im", null);
 			basic_type_info_map.replace(offset, new OtherTypeInfo(basic_info, complex64_datatype));
 		}else if(basic_info.kind==Kind.Complex128) {
 			StructureDataType complex128_datatype=new StructureDataType("complex128", 0);
-			complex128_datatype.setMinimumAlignment(basic_info.align);
+			complex128_datatype.setExplicitMinimumAlignment(basic_info.align);
 			complex128_datatype.add(new Float8DataType(), "re", null);
 			complex128_datatype.add(new Float8DataType(), "im", null);
 			basic_type_info_map.replace(offset, new OtherTypeInfo(basic_info, complex128_datatype));
@@ -736,7 +736,7 @@ boolean analyze_type(Address type_base_addr, long offset, boolean is_go16) {
 			basic_type_info_map.replace(offset, new SliceTypeInfo(basic_info, elem_addr_value-type_base_addr.getOffset()));
 		}else if(basic_info.kind==Kind.String) {
 			StructureDataType string_datatype=new StructureDataType("string", 0);
-			string_datatype.setMinimumAlignment(basic_info.align);
+			string_datatype.setExplicitMinimumAlignment(basic_info.align);
 			string_datatype.add(new PointerDataType(new StringDataType(), pointer_size), "__data", null);
 			string_datatype.add(new IntegerDataType(), "__length", null);
 			basic_type_info_map.replace(offset, new OtherTypeInfo(basic_info, string_datatype));