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.

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

Rework Variant.h #714

Merged
merged 1 commit into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 14 additions & 8 deletions src/jvm_wrapper/memory/transfer_context.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include "transfer_context.h"

#include "script/jvm_script_manager.h"
#include "script/jvm_instance.h"

const int MAX_STACK_SIZE = MAX_FUNCTION_ARG_COUNT * 8;
Expand Down Expand Up @@ -30,28 +29,28 @@ SharedBuffer* TransferContext::get_and_rewind_buffer(jni::Env& p_env) {

void TransferContext::read_return_value(jni::Env& p_env, Variant& r_ret) {
SharedBuffer* buffer {get_and_rewind_buffer(p_env)};
ktvariant::get_variant_from_buffer(buffer, r_ret);
BufferToVariant::read_variant(buffer, r_ret);
}

void TransferContext::write_args(jni::Env& p_env, const Variant** p_args, int args_size) {
SharedBuffer* buffer {get_and_rewind_buffer(p_env)};
buffer->increment_position(encode_uint32(args_size, buffer->get_cursor()));
for (auto i = 0; i < args_size; ++i) {
ktvariant::send_variant_to_buffer(*p_args[i], buffer);
VariantToBuffer::write_variant(*p_args[i], buffer);
}
}

uint32_t TransferContext::read_args(jni::Env& p_env, Variant* args) {
SharedBuffer* buffer {get_and_rewind_buffer(p_env)};
uint32_t size {read_args_size(buffer)};
for (uint32_t i = 0; i < size; ++i) {
ktvariant::get_variant_from_buffer(buffer, args[i]);
BufferToVariant::read_variant(buffer, args[i]);
}
return size;
}

void TransferContext::write_return_value(jni::Env& p_env, Variant& variant) {
ktvariant::send_variant_to_buffer(variant, get_and_rewind_buffer(p_env));
VariantToBuffer::write_variant(variant, get_and_rewind_buffer(p_env));
}

void TransferContext::write_object_data(jni::Env& p_env, uintptr_t ptr, ObjectID id) {
Expand All @@ -77,7 +76,14 @@ void TransferContext::icall(JNIEnv* rawEnv, jobject instance, jlong j_ptr, jlong

MethodBind* method_bind {reinterpret_cast<MethodBind*>(static_cast<uintptr_t>(j_method_ptr))};

JVM_DEV_ASSERT(args_size <= MAX_FUNCTION_ARG_COUNT, "Cannot have more than %s arguments for method call but tried to call method \"%s::%s\" with %s args", MAX_FUNCTION_ARG_COUNT, method_bind->get_instance_class(), method_bind->get_name(), args_size);
JVM_DEV_ASSERT(
args_size <= MAX_FUNCTION_ARG_COUNT,
"Cannot have more than %s arguments for method call but tried to call method \"%s::%s\" with %s args",
MAX_FUNCTION_ARG_COUNT,
method_bind->get_instance_class(),
method_bind->get_name(),
args_size
);

Callable::CallError r_error {Callable::CallError::CALL_OK};

Expand All @@ -93,7 +99,7 @@ void TransferContext::icall(JNIEnv* rawEnv, jobject instance, jlong j_ptr, jlong
const Variant& ret_value {method_bind->call(ptr, args_ptr, args_size, r_error)};

buffer->rewind();
ktvariant::send_variant_to_buffer(ret_value, buffer);
VariantToBuffer::write_variant(ret_value, buffer);
} else {
Variant* args {variant_args + stack_offset};
read_args_to_array(buffer, args, args_size);
Expand All @@ -109,7 +115,7 @@ void TransferContext::icall(JNIEnv* rawEnv, jobject instance, jlong j_ptr, jlong
stack_offset -= args_size;

buffer->rewind();
ktvariant::send_variant_to_buffer(ret_value, buffer);
VariantToBuffer::write_variant(ret_value, buffer);
}

#ifdef DEBUG_ENABLED
Expand Down
2 changes: 1 addition & 1 deletion src/jvm_wrapper/memory/transfer_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ JVM_SINGLETON_WRAPPER(TransferContext, "godot.core.memory.TransferContext") {

_FORCE_INLINE_ static void read_args_to_array(SharedBuffer* buffer, Variant* p_args, uint32_t args_size) {
for (uint32_t i = 0; i < args_size; ++i) {
ktvariant::get_variant_from_buffer(buffer, p_args[i]);
BufferToVariant::read_variant(buffer, p_args[i]);
}
}
};
Expand Down
Loading
Loading