Skip to content

Commit

Permalink
Merge branch 'Tencent:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@ArnoChenFx
ArnoChenFx authored Dec 27, 2024
2 parents ff53821 + e0a0271 commit c8a743d
Show file tree
Hide file tree
Showing 9 changed files with 1,273 additions and 1,063 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/unity_unittest.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,10 @@ jobs:
cd unity/test/unity
echo "testresult in v1"
cat log1.txt | grep "Failed\|Passed"
echo "testresult in v2"
echo "testresult in v2(reflection)"
cat log2.txt | grep "Failed\|Passed"
echo "testresult in v2"
cat log3.txt | grep "Failed\|Passed"
# unittest-osx-unity:
# runs-on: macos-latest
Expand Down
234 changes: 165 additions & 69 deletions unity/Assets/core/upm/Editor/Resources/puerts/xil2cpp/Puerts_il2cpp.cpp.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -641,85 +641,89 @@ pesapi_value TryTranslateBuiltin(struct pesapi_ffi* apis, pesapi_env env, Il2Cpp
return nullptr;
}

static pesapi_value TryTranslatePrimitiveWithClass(struct pesapi_ffi* apis, pesapi_env env, Il2CppObject* obj, Il2CppClass *klass = nullptr)
static pesapi_value TryTranslatePrimitivePtr(struct pesapi_ffi* apis, pesapi_env env, Il2CppTypeEnum type, void* ptr)
{
if (obj)
switch (type)
{
const Il2CppType *type = Class::GetType(klass ? klass : obj->klass);
int t = type->type;
if (t == IL2CPP_TYPE_STRING)
case IL2CPP_TYPE_I1:
{
const Il2CppChar* utf16 = il2cpp::utils::StringUtils::GetChars((Il2CppString*)obj);
std::string str = il2cpp::utils::StringUtils::Utf16ToUtf8(utf16);
return apis->create_string_utf8(env, str.c_str(), str.size());
return apis->create_int32(env, (int32_t)(*((int8_t*)ptr)));
}
void* ptr = Object::Unbox(obj);
switch (t)
case IL2CPP_TYPE_BOOLEAN:
{
case IL2CPP_TYPE_I1:
{
return apis->create_int32(env, (int32_t)(*((int8_t*)ptr)));
}
case IL2CPP_TYPE_BOOLEAN:
{
return apis->create_boolean(env, (bool)(*((uint8_t*)ptr)));
}
case IL2CPP_TYPE_U1:
{
return apis->create_uint32(env, (uint32_t)(*((uint8_t*)ptr)));
}
case IL2CPP_TYPE_I2:
{
return apis->create_int32(env, (int32_t)(*((int16_t*)ptr)));
}
case IL2CPP_TYPE_U2:
{
return apis->create_uint32(env, (uint32_t)(*((uint16_t*)ptr)));
}
case IL2CPP_TYPE_CHAR:
{
return apis->create_int32(env, (int32_t)(*((Il2CppChar*)ptr)));
}
return apis->create_boolean(env, (bool)(*((uint8_t*)ptr)));
}
case IL2CPP_TYPE_U1:
{
return apis->create_uint32(env, (uint32_t)(*((uint8_t*)ptr)));
}
case IL2CPP_TYPE_I2:
{
return apis->create_int32(env, (int32_t)(*((int16_t*)ptr)));
}
case IL2CPP_TYPE_U2:
{
return apis->create_uint32(env, (uint32_t)(*((uint16_t*)ptr)));
}
case IL2CPP_TYPE_CHAR:
{
return apis->create_int32(env, (int32_t)(*((Il2CppChar*)ptr)));
}
#if IL2CPP_SIZEOF_VOID_P == 4
case IL2CPP_TYPE_I:
case IL2CPP_TYPE_I:
#endif
case IL2CPP_TYPE_I4:
{
return apis->create_int32(env, (int32_t)(*((int32_t*)ptr)));
}
case IL2CPP_TYPE_I4:
{
return apis->create_int32(env, (int32_t)(*((int32_t*)ptr)));
}
#if IL2CPP_SIZEOF_VOID_P == 4
case IL2CPP_TYPE_U:
case IL2CPP_TYPE_U:
#endif
case IL2CPP_TYPE_U4:
{
return apis->create_uint32(env, (uint32_t)(*((uint32_t*)ptr)));
}
case IL2CPP_TYPE_U4:
{
return apis->create_uint32(env, (uint32_t)(*((uint32_t*)ptr)));
}
#if IL2CPP_SIZEOF_VOID_P == 8
case IL2CPP_TYPE_I:
case IL2CPP_TYPE_I:
#endif
case IL2CPP_TYPE_I8:
{
return apis->create_int64(env, *((int64_t*)ptr));
}
case IL2CPP_TYPE_I8:
{
return apis->create_int64(env, *((int64_t*)ptr));
}
#if IL2CPP_SIZEOF_VOID_P == 8
case IL2CPP_TYPE_U:
case IL2CPP_TYPE_U:
#endif
case IL2CPP_TYPE_U8:
{
return apis->create_uint64(env, *((uint64_t*)ptr));
}
case IL2CPP_TYPE_R4:
{
return apis->create_double(env, (double)(*((float*)ptr)));
}
case IL2CPP_TYPE_R8:
{
return apis->create_double(env, *((double*)ptr));
}

default:
return nullptr;
case IL2CPP_TYPE_U8:
{
return apis->create_uint64(env, *((uint64_t*)ptr));
}
case IL2CPP_TYPE_R4:
{
return apis->create_double(env, (double)(*((float*)ptr)));
}
case IL2CPP_TYPE_R8:
{
return apis->create_double(env, *((double*)ptr));
}

default:
return nullptr;
}
}

static pesapi_value TryTranslatePrimitiveWithClass(struct pesapi_ffi* apis, pesapi_env env, Il2CppObject* obj, Il2CppClass *klass = nullptr)
{
if (obj)
{
const Il2CppType *type = Class::GetType(klass ? klass : obj->klass);
if (type->type == IL2CPP_TYPE_STRING)
{
const Il2CppChar* utf16 = il2cpp::utils::StringUtils::GetChars((Il2CppString*)obj);
std::string str = il2cpp::utils::StringUtils::Utf16ToUtf8(utf16);
return apis->create_string_utf8(env, str.c_str(), str.size());
}
void* ptr = Object::Unbox(obj);
return TryTranslatePrimitivePtr(apis, env, type->type, ptr);
}

return nullptr;
Expand Down Expand Up @@ -1082,6 +1086,60 @@ pesapi_value CSRefToJsValue(struct pesapi_ffi* apis, pesapi_env env, Il2CppClass
return apis->native_object_to_value(env, objClass, obj, false);
}

static bool NullableHasValue(Il2CppClass* klass, void* data)
{
uint8_t* hasValueByte = static_cast<uint8_t*>(data);
return *hasValueByte != 0;
}

pesapi_value CSValueTypePtrToJsValue(struct pesapi_ffi* apis, pesapi_env env, Il2CppClass* targetClass, void* ptr)
{
if (targetClass == il2cpp_defaults.void_class) return apis->create_undefined(env);
if (!ptr) return apis->create_null(env);

if (!targetClass)
{
targetClass = il2cpp_defaults.object_class;
}

bool isNullable = Class::IsNullable(targetClass);

if (isNullable)
{
if (!NullableHasValue(targetClass, ptr))
{
return apis->create_null(env);
}
uint8_t* valueStart = static_cast<uint8_t*>(ptr);
int32_t nullableShift = targetClass->fields[1].offset - sizeof(Il2CppObject);
valueStart += nullableShift;
ptr = valueStart;
}

if (Class::IsEnum(targetClass))
{
targetClass = Class::GetElementClass(targetClass);
}
const Il2CppType* type = Class::GetType(targetClass);

pesapi_value jsVal = TryTranslatePrimitivePtr(apis, env, type->type, ptr);

if (jsVal)
{
return jsVal;
}

auto len = targetClass->native_size;
if (len < 0)
{
len = targetClass->instance_size - sizeof(Il2CppObject);
}

auto buff = new uint8_t[len];
memcpy(buff, ptr, len);
return apis->native_object_to_value(env, targetClass, buff, true);
}

static bool GetValueTypeFromJs(struct pesapi_ffi* apis, pesapi_env env, pesapi_value jsValue, Il2CppClass* klass, void* storage)
{
bool hasValue = false;
Expand Down Expand Up @@ -1576,7 +1634,39 @@ handle_underlying:
}
}

Il2CppObject* ret = Runtime::InvokeWithThrow(method, self, args); //返回ValueType有boxing
//Il2CppObject* ret = Runtime::InvokeWithThrow(method, self, args); //返回ValueType有boxing
void* returnValue = NULL;
bool returnIsValueType = false;
Il2CppClass* returnType = Class::FromIl2CppType(method->return_type);
if (method->return_type->type == IL2CPP_TYPE_VOID)
{
method->invoker_method(method->methodPointer, method, self, args, NULL);
}
else
{
if (method->return_type->valuetype)
{
Class::Init(returnType);
returnValue = alloca(returnType->instance_size - sizeof(Il2CppObject));
method->invoker_method(method->methodPointer, method, self, args, returnValue);
returnIsValueType = true;
}
else
{
method->invoker_method(method->methodPointer, method, self, args, &returnValue);
if (method->return_type->byref)
{
if (Class::IsValuetype(returnType))
{
returnIsValueType = true;
}
else
{
returnValue = *(Il2CppObject**)returnValue;
}
}
}
}

for (int i = csArgStart; i < method->parameters_count; ++i)
{
Expand Down Expand Up @@ -1617,10 +1707,16 @@ handle_underlying:
}
}

auto returnType = Class::FromIl2CppType(method->return_type);
if (returnType != il2cpp_defaults.void_class)
if (method->return_type->type != IL2CPP_TYPE_VOID)
{
apis->add_return(info, CSRefToJsValue(apis, env, returnType, ret));
if (returnIsValueType)
{
apis->add_return(info, CSValueTypePtrToJsValue(apis, env, returnType, returnValue));
}
else
{
apis->add_return(info, CSRefToJsValue(apis, env, returnType, (Il2CppObject*)returnValue));
}
}

return true;
Expand Down
21 changes: 19 additions & 2 deletions unity/Assets/core/upm/Editor/Src/Generator/IL2Cpp/FileExporter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ private static void IterateAllType(Type type, HashSet<Type> allTypes)
}
}

public static void GenCPPWrap(string saveTo, bool onlyConfigure = false)
public static void GenCPPWrap(string saveTo, bool onlyConfigure = false, bool noWrapper = false)
{
Utils.SetFilters(Puerts.Configure.GetFilters());

Expand Down Expand Up @@ -308,7 +308,24 @@ from type in assembly.GetTypes()
var genWrapperMethod = methodToWrap;
var genWrapperField = fieldToWrapper;

if (onlyConfigure)
if (noWrapper)
{
genWrapperCtor = new ConstructorInfo[] { };
genWrapperMethod = new MethodInfo[] { };
genWrapperField = new FieldInfo[] { };

valueTypeInfos = new List<ValueTypeInfo>();
foreach (var type in delegateUsedTypes)
{
IterateAllValueType(type, valueTypeInfos);
}

valueTypeInfos = valueTypeInfos
.GroupBy(s => s.Signature)
.Select(s => s.FirstOrDefault())
.ToList();
}
else if (onlyConfigure)
{
var configure = Puerts.Configure.GetConfigureByTags(new List<string>() {
"Puerts.BindingAttribute",
Expand Down
31 changes: 29 additions & 2 deletions unity/Assets/core/upm/Editor/Src/Generator/IL2Cpp/UnityMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,25 @@ namespace PuertsIl2cpp.Editor
namespace Generator {

public class UnityMenu {
[MenuItem(Puerts.Editor.Generator.UnityMenu.PUERTS_MENU_PREFIX + "/Generate For xIl2cpp mode (all in one)", false, 2)]
[MenuItem(Puerts.Editor.Generator.UnityMenu.PUERTS_MENU_PREFIX + "/Generate For xIl2cpp mode (all in one without wrapper)", false, 2)]
public static void GenV2WithoutWrapper()
{
GenerateEmptyCppWrappers();
GenerateExtensionMethodInfos();
GenerateLinkXML();
GenerateCppPlugin();
Puerts.Editor.Generator.UnityMenu.GenRegisterInfo();
}

[MenuItem(Puerts.Editor.Generator.UnityMenu.PUERTS_MENU_PREFIX + "/Generate For xIl2cpp mode (all in one with full wrapper)", false, 3)]
public static void GenV2() {
GenerateCppWrappers();
GenerateExtensionMethodInfos();
GenerateLinkXML();
GenerateCppPlugin();
Puerts.Editor.Generator.UnityMenu.GenRegisterInfo();
}


[MenuItem(Puerts.Editor.Generator.UnityMenu.PUERTS_MENU_PREFIX + "/Generate/il2cpp c file", false, 6)]
public static void GenerateCppPlugin()
Expand All @@ -46,7 +57,7 @@ public static void GenerateCppPlugin()
Debug.Log("finished! use " + (DateTime.Now - start).TotalMilliseconds + " ms Outputed to " + saveTo);
}

[MenuItem(Puerts.Editor.Generator.UnityMenu.PUERTS_MENU_PREFIX + "/Generate/il2cpp wrapper bridge", false, 6)]
[MenuItem(Puerts.Editor.Generator.UnityMenu.PUERTS_MENU_PREFIX + "/Generate/il2cpp wrapper bridge(Full)", false, 6)]
public static void GenerateCppWrappers()
{
var start = DateTime.Now;
Expand Down Expand Up @@ -80,6 +91,22 @@ public static void GenerateCppWrappersInConfigure()
Debug.Log("finished! use " + (DateTime.Now - start).TotalMilliseconds + " ms Outputed to " + saveTo);
}

public static void GenerateEmptyCppWrappers()
{
var start = DateTime.Now;
#if CPP_OUTPUT_TO_NATIVE_SRC
var saveTo = Path.Combine(Application.dataPath, "core/upm/Plugins/puerts_il2cpp/");
#elif PUERTS_CPP_OUTPUT_TO_UPM
var saveTo = Path.Combine(Path.GetFullPath("Packages/com.tencent.puerts.core/"), "Plugins/puerts_il2cpp/");
#else
var saveTo = Path.Combine(Puerts.Configure.GetCodeOutputDirectory(), "Plugins/puerts_il2cpp/");
#endif

Directory.CreateDirectory(saveTo);
FileExporter.GenCPPWrap(saveTo, false, true);
Debug.Log("finished! use " + (DateTime.Now - start).TotalMilliseconds + " ms Outputed to " + saveTo);
}

[MenuItem(Puerts.Editor.Generator.UnityMenu.PUERTS_MENU_PREFIX + "/Generate/il2cpp ExtensionMethodInfos_Gen.cs", false, 6)]
public static void GenerateExtensionMethodInfos()
{
Expand Down
3 changes: 1 addition & 2 deletions unity/Assets/core/upm/Runtime/Src/IL2Cpp/Native/NativeAPI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class NativeAPI
#else
const string DLLNAME = "puerts";
#endif
#if PUERTS_IL2CPP_OPTIMIZATION && ENABLE_IL2CPP

[DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)]
public static extern IntPtr GetRegsterApi();
Expand All @@ -30,8 +31,6 @@ public class NativeAPI
[DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)]
public static extern IntPtr GetPapiEnvRef(IntPtr isolate);

#if PUERTS_IL2CPP_OPTIMIZATION && ENABLE_IL2CPP

[DllImport("__Internal", CallingConvention = CallingConvention.Cdecl)]
public static extern void InitialPuerts(IntPtr PesapiImpl);

Expand Down
Loading

0 comments on commit c8a743d

Please sign in to comment.