diff --git a/runtime/bridge.h b/runtime/bridge.h index fbecbf3a9cc5737f725e57486b838009710d099e..49560ca339ddca17589f3317d84643ef2b95316c 100644 --- a/runtime/bridge.h +++ b/runtime/bridge.h @@ -21,7 +21,7 @@ namespace panda { // Uses DynCall calling convention -extern "C" DecodedTaggedValue CompiledCodeToBuiltinBridge(); +extern "C" void CompiledCodeToBuiltinBridge(); } // namespace panda diff --git a/runtime/bridge/arch/aarch64/builtin_bridge_aarch64.S b/runtime/bridge/arch/aarch64/builtin_bridge_aarch64.S index 408d838c5cda92e94f7f7dbdf119b61b515f724e..24b7bf4d2e96e7531fa72ff3cdeaae3b55499e79 100644 --- a/runtime/bridge/arch/aarch64/builtin_bridge_aarch64.S +++ b/runtime/bridge/arch/aarch64/builtin_bridge_aarch64.S @@ -19,7 +19,7 @@ // extern "C" uint64_t InvokeBuiltinHandleException(JSThread *thread, JSTaggedValue retval) .extern InvokeBuiltinHandleException -// DecodedTaggedValue CompiledCodeToBuiltinBridge, follows DynamicMethod calling convention +// CompiledCodeToBuiltinBridge, follows DynamicMethod calling convention .global CompiledCodeToBuiltinBridge .type CompiledCodeToBuiltinBridge, %function CompiledCodeToBuiltinBridge: diff --git a/runtime/bridge/arch/amd64/builtin_bridge_amd64.S b/runtime/bridge/arch/amd64/builtin_bridge_amd64.S index 140d20e1794aee4fb2f34ee67a02ca02c5933b0a..3c934e490524a5e35f21a1115b462d8db1fb6244 100644 --- a/runtime/bridge/arch/amd64/builtin_bridge_amd64.S +++ b/runtime/bridge/arch/amd64/builtin_bridge_amd64.S @@ -20,7 +20,7 @@ // extern "C" uint64_t InvokeBuiltinHandleException(JSThread *thread, JSTaggedValue retval) .extern InvokeBuiltinHandleException -// DecodedTaggedValue CompiledCodeToBuiltinBridge, follows DynamicMethod calling convention +// CompiledCodeToBuiltinBridge, follows DynamicMethod calling convention .global CompiledCodeToBuiltinBridge .type CompiledCodeToBuiltinBridge, %function CompiledCodeToBuiltinBridge: diff --git a/runtime/bridge/arch/arm/builtin_bridge_arm.S b/runtime/bridge/arch/arm/builtin_bridge_arm.S index abd721f80c019437f7ab42b7f5db605d853870f1..ac89266faab20a59f290ad35a1fea816c9bfcd14 100644 --- a/runtime/bridge/arch/arm/builtin_bridge_arm.S +++ b/runtime/bridge/arch/arm/builtin_bridge_arm.S @@ -13,11 +13,8 @@ * limitations under the License. */ -// DecodedTaggedValue InvokeBuiltin(ManagedThread* thread, Method* method, uint32_t num_args, -// DecodedTaggedValue* gpr_args, DecodedTaggedValue* stack_args) -.extern InvokeBuiltin -// DecodedTaggedValue CompiledCodeToBuiltinBridge(Method* method, uint32_t num_args, DecodedTaggedValue func_obj, ...); +// CompiledCodeToBuiltinBridge(Method* method, uint32_t num_args, panda::coretypes::TaggedValue func_obj, ...); .global CompiledCodeToBuiltinBridge .type CompiledCodeToBuiltinBridge, %function CompiledCodeToBuiltinBridge: diff --git a/runtime/ecma_language_context.h b/runtime/ecma_language_context.h index 79013806bddf210a01a124a91df083565b255adc..4356898e67f8bc15cdda773d21f25136d9e7eda3 100644 --- a/runtime/ecma_language_context.h +++ b/runtime/ecma_language_context.h @@ -55,22 +55,7 @@ public: coretypes::TaggedValue GetInitialTaggedValue() const override { - UNREACHABLE(); - } - - uint64_t GetTypeTag(interpreter::TypeTag tag) const override - { - return tag; - } - - DecodedTaggedValue GetInitialDecodedValue() const override - { - return DecodedTaggedValue(coretypes::TaggedValue::VALUE_UNDEFINED, 0); - } - - DecodedTaggedValue GetDecodedTaggedValue([[maybe_unused]] const coretypes::TaggedValue &value) const override - { - UNREACHABLE(); + return coretypes::TaggedValue(coretypes::TaggedValue::VALUE_UNDEFINED); } coretypes::TaggedValue GetEncodedTaggedValue([[maybe_unused]] int64_t value, diff --git a/runtime/js_invoker.cpp b/runtime/js_invoker.cpp index 2915fd1c25ea73f685c0e7a6aa70a30391a70734..d42515eb140a549a1732e0a118b0741a9c51a79e 100644 --- a/runtime/js_invoker.cpp +++ b/runtime/js_invoker.cpp @@ -47,26 +47,6 @@ extern "C" uint64_t InvokeBuiltinHandleException(JSThread *thread, JSTaggedValue UNREACHABLE(); } -extern "C" uint64_t InvokeBuiltin(JSThread *thread, Method *method, uint32_t num_args, JSTaggedValue *stack_args) -{ - EcmaRuntimeCallInfo ecma_runtime_call_info(thread, num_args, stack_args); - - ASSERT(method->GetNativePointer() != nullptr); - - if (UNLIKELY((!thread->StackOverflowCheck()))) { - return JSTaggedValue::Exception().GetRawData(); - } - - JSTaggedValue ret_value = - reinterpret_cast(const_cast(method->GetNativePointer()))(&ecma_runtime_call_info); - - if (UNLIKELY(thread->HasPendingException())) { - return InvokeBuiltinHandleException(thread, ret_value); - } - - return ret_value.GetRawData(); -} - JSTaggedValue InvokeJsFunction(EcmaRuntimeCallInfo *info) { return EcmaInterpreter::Execute(info);