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.

Sign up for GitHub

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

[interp] Unify execution and valuetype stacks #43681

Merged
merged 1 commit into from
Oct 26, 2020
Merged

[interp] Unify execution and valuetype stacks #43681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/mono/mono/metadata/remoting.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,9 +761,10 @@ mono_marshal_get_xappdomain_dispatch (MonoMethod *method, int *marshal_types, in

mono_mb_emit_ldarg (mb, 1);
mono_mb_emit_byte (mb, CEE_LDIND_REF);
mono_mb_emit_byte (mb, CEE_DUP);
pos = mono_mb_emit_short_branch (mb, CEE_BRFALSE_S);

mono_mb_emit_ldarg (mb, 1);
mono_mb_emit_byte (mb, CEE_LDIND_REF);
mono_marshal_emit_xdomain_copy_value (mb, byte_array_class);
mono_mb_emit_managed_call (mb, method_rs_deserialize, NULL);

Expand Down
4 changes: 1 addition & 3 deletions src/mono/mono/mini/ee.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#ifndef __MONO_EE_H__
#define __MONO_EE_H__

#define MONO_EE_API_VERSION 0xf
#define MONO_EE_API_VERSION 0x10

typedef struct _MonoInterpStackIter MonoInterpStackIter;

Expand Down Expand Up @@ -49,11 +49,9 @@ typedef gpointer MonoInterpFrameHandle;
MONO_EE_CALLBACK (gpointer, frame_get_arg, (MonoInterpFrameHandle frame, int pos)) \
MONO_EE_CALLBACK (gpointer, frame_get_local, (MonoInterpFrameHandle frame, int pos)) \
MONO_EE_CALLBACK (gpointer, frame_get_this, (MonoInterpFrameHandle frame)) \
MONO_EE_CALLBACK (gpointer, frame_get_res, (MonoInterpFrameHandle frame)) \
MONO_EE_CALLBACK (void, frame_arg_to_data, (MonoInterpFrameHandle frame, MonoMethodSignature *sig, int index, gpointer data)) \
MONO_EE_CALLBACK (void, data_to_frame_arg, (MonoInterpFrameHandle frame, MonoMethodSignature *sig, int index, gconstpointer data)) \
MONO_EE_CALLBACK (gpointer, frame_arg_to_storage, (MonoInterpFrameHandle frame, MonoMethodSignature *sig, int index)) \
MONO_EE_CALLBACK (void, frame_arg_set_storage, (MonoInterpFrameHandle frame, MonoMethodSignature *sig, int index, gpointer storage)) \
MONO_EE_CALLBACK (MonoInterpFrameHandle, frame_get_parent, (MonoInterpFrameHandle frame)) \
MONO_EE_CALLBACK (void, start_single_stepping, (void)) \
MONO_EE_CALLBACK (void, stop_single_stepping, (void)) \
Expand Down
6 changes: 0 additions & 6 deletions src/mono/mono/mini/interp-stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,12 +211,6 @@ stub_frame_arg_to_storage (MonoInterpFrameHandle frame, MonoMethodSignature *sig
return NULL;
}

static void
stub_frame_arg_set_storage (MonoInterpFrameHandle frame, MonoMethodSignature *sig, int index, gpointer storage)
{
g_assert_not_reached ();
}

static void
stub_free_context (gpointer context)
{
Expand Down
3 changes: 2 additions & 1 deletion src/mono/mono/mini/interp/interp-internals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#define PROFILING_FLAG 0x2

#define MINT_VT_ALIGNMENT 8
#define MINT_STACK_SLOT_SIZE (sizeof (stackval))

#define INTERP_STACK_SIZE (1024*1024)

Expand Down Expand Up @@ -116,6 +117,7 @@ struct InterpMethod {
MonoExceptionClause *clauses; // num_clauses
void **data_items;
guint32 *local_offsets;
guint32 *arg_offsets;
guint32 *clause_data_offsets;
gpointer jit_call_info;
gpointer jit_entry;
Expand All @@ -127,7 +129,6 @@ struct InterpMethod {

guint32 total_locals_size;
guint32 stack_size;
guint32 vt_stack_size;
guint32 alloca_size;
int num_clauses; // clauses
int transformed; // boolean
Expand Down
Loading