Skip to content

WASM: Fix System.Diagnostics.Tracing #39271

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

Merged
akoeplinger merged 1 commit into from
Jul 14, 2020
Merged

WASM: Fix System.Diagnostics.Tracing #39271

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
1 change: 0 additions & 1 deletion src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Data.Common\tests\System.Data.Common.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.DiagnosticSource\tests\TestWithConfigSwitches\System.Diagnostics.DiagnosticSource.Switches.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.TextWriterTraceListener\tests\System.Diagnostics.TextWriterTraceListener.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.Tracing\tests\System.Diagnostics.Tracing.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Globalization.Calendars\tests\CalendarTestWithConfigSwitch\System.Globalization.CalendarsWithConfigSwitch.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Globalization.Calendars\tests\System.Globalization.Calendars.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Globalization.Extensions\tests\System.Globalization.Extensions.Tests.csproj" />
Expand Down
47 changes: 47 additions & 0 deletions src/mono/mono/mini/wasm_m2n_invoke.g.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,16 @@ wasm_invoke_iiliiii (void *target_func, InterpMethodArguments *margs)

}

static void
wasm_invoke_iiiliiii (void *target_func, InterpMethodArguments *margs)
Copy link
Member

@stephentoub stephentoub Jul 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does "iiiliiii" mean?

Copy link
Member

@stephentoub stephentoub Jul 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, it's the signature, i.e. it returns an int, and accepts two ints, then a long, then four ints?

Copy link
Member Author

@akoeplinger akoeplinger Jul 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

correct

{
typedef int (*T)(int arg_0, int arg_1, gint64 arg_2, int arg_3, int arg_4, int arg_5, int arg_6);
T func = (T)target_func;
int res = func ((int)(gssize)margs->iargs [0], (int)(gssize)margs->iargs [1], get_long_arg (margs, 2), (int)(gssize)margs->iargs [4], (int)(gssize)margs->iargs [5], (int)(gssize)margs->iargs [6], (int)(gssize)margs->iargs [7]);
*(int*)margs->retval = res;

}

static void
wasm_invoke_iiil (void *target_func, InterpMethodArguments *margs)
{
Expand All @@ -306,6 +316,26 @@ wasm_invoke_iiil (void *target_func, InterpMethodArguments *margs)

}

static void
wasm_invoke_iiilli (void *target_func, InterpMethodArguments *margs)
{
typedef int (*T)(int arg_0, int arg_1, gint64 arg_2, gint64 arg_3, int arg_4);
T func = (T)target_func;
int res = func ((int)(gssize)margs->iargs [0], (int)(gssize)margs->iargs [1], get_long_arg (margs, 2), get_long_arg (margs, 4), (int)(gssize)margs->iargs [6]);
*(int*)margs->retval = res;

}

static void
wasm_invoke_il (void *target_func, InterpMethodArguments *margs)
{
typedef int (*T)(gint64 arg_0);
T func = (T)target_func;
int res = func (get_long_arg (margs, 0));
*(int*)margs->retval = res;

}

static void
wasm_invoke_if (void *target_func, InterpMethodArguments *margs)
{
Expand Down Expand Up @@ -1162,6 +1192,15 @@ wasm_invoke_viil (void *target_func, InterpMethodArguments *margs)

}

static void
wasm_invoke_vlii (void *target_func, InterpMethodArguments *margs)
{
typedef void (*T)(gint64 arg_0, int arg_1, int arg_2);
T func = (T)target_func;
func (get_long_arg (margs, 0), (int)(gssize)margs->iargs [2], (int)(gssize)margs->iargs [3]);

}

static void
wasm_invoke_fifff (void *target_func, InterpMethodArguments *margs)
{
Expand Down Expand Up @@ -1616,12 +1655,15 @@ static const char* interp_to_native_signatures [] = {
"IIIIIIIIIIIII",
"IIIIIIIIIIIIII",
"IIIL",
"IIILIIII",
"IIILLI",
"IIL",
"IILI",
"IILIIII",
"IILIIIL",
"IILLI",
"IILLLI",
"IL",
"ILI",
"L",
"LI",
Expand Down Expand Up @@ -1686,6 +1728,7 @@ static const char* interp_to_native_signatures [] = {
"VIL",
"VILLI",
"VL",
"VLII",
};
static void* interp_to_native_invokes [] = {
wasm_invoke_dd,
Expand Down Expand Up @@ -1776,12 +1819,15 @@ wasm_invoke_iiiiiiiiiiii,
wasm_invoke_iiiiiiiiiiiii,
wasm_invoke_iiiiiiiiiiiiii,
wasm_invoke_iiil,
wasm_invoke_iiiliiii,
wasm_invoke_iiilli,
wasm_invoke_iil,
wasm_invoke_iili,
wasm_invoke_iiliiii,
wasm_invoke_iiliiil,
wasm_invoke_iilli,
wasm_invoke_iillli,
wasm_invoke_il,
wasm_invoke_ili,
wasm_invoke_l,
wasm_invoke_li,
Expand Down Expand Up @@ -1846,4 +1892,5 @@ wasm_invoke_viil,
wasm_invoke_vil,
wasm_invoke_villi,
wasm_invoke_vl,
wasm_invoke_vlii,
};