Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[interp] Overflow fixes #9688

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
BrzVlad merged 4 commits into from
Jul 28, 2018
Merged

[interp] Overflow fixes #9688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10b470d
[interp] Fix some conv ovf opcodes
BrzVlad Jul 22, 2018
712d1d1
[interp] Correctly hande a few conv ovf cases
BrzVlad Jul 22, 2018
8396feb
[interp] Fix multiplication overflow case
BrzVlad Jul 22, 2018
fcfc2fe
[interp] Remove some constants from code
BrzVlad Jul 27, 2018
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
6 changes: 6 additions & 0 deletions mono/eglib/glib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@ typedef guint32 gunichar;
#define G_MAXUSHORT USHRT_MAX
#define G_MAXINT INT_MAX
#define G_MININT INT_MIN
#define G_MAXINT8 INT8_MAX
#define G_MAXUINT8 UINT8_MAX
#define G_MININT8 INT8_MIN
#define G_MAXINT16 INT16_MAX
#define G_MAXUINT16 UINT16_MAX
#define G_MININT16 INT16_MIN
#define G_MAXINT32 INT32_MAX
#define G_MAXUINT32 UINT32_MAX
#define G_MININT32 INT32_MIN
Expand Down
142 changes: 86 additions & 56 deletions mono/mini/interp/interp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1500,39 +1500,30 @@ get_trace_ips (MonoDomain *domain, InterpFrame *top)
return res;
}


#define MYGUINT64_MAX 18446744073709551615ULL
#define MYGINT64_MAX 9223372036854775807LL
#define MYGINT64_MIN (-MYGINT64_MAX -1LL)

#define MYGUINT32_MAX 4294967295U
#define MYGINT32_MAX 2147483647
#define MYGINT32_MIN (-MYGINT32_MAX -1)

#define CHECK_ADD_OVERFLOW(a,b) \
(gint32)(b) >= 0 ? (gint32)(MYGINT32_MAX) - (gint32)(b) < (gint32)(a) ? -1 : 0 \
: (gint32)(MYGINT32_MIN) - (gint32)(b) > (gint32)(a) ? +1 : 0
(gint32)(b) >= 0 ? (gint32)(G_MAXINT32) - (gint32)(b) < (gint32)(a) ? -1 : 0 \
: (gint32)(G_MININT32) - (gint32)(b) > (gint32)(a) ? +1 : 0

#define CHECK_SUB_OVERFLOW(a,b) \
(gint32)(b) < 0 ? (gint32)(MYGINT32_MAX) + (gint32)(b) < (gint32)(a) ? -1 : 0 \
: (gint32)(MYGINT32_MIN) + (gint32)(b) > (gint32)(a) ? +1 : 0
(gint32)(b) < 0 ? (gint32)(G_MAXINT32) + (gint32)(b) < (gint32)(a) ? -1 : 0 \
: (gint32)(G_MININT32) + (gint32)(b) > (gint32)(a) ? +1 : 0

#define CHECK_ADD_OVERFLOW_UN(a,b) \
(guint32)(MYGUINT32_MAX) - (guint32)(b) < (guint32)(a) ? -1 : 0
(guint32)(G_MAXUINT32) - (guint32)(b) < (guint32)(a) ? -1 : 0

#define CHECK_SUB_OVERFLOW_UN(a,b) \
(guint32)(a) < (guint32)(b) ? -1 : 0

#define CHECK_ADD_OVERFLOW64(a,b) \
(gint64)(b) >= 0 ? (gint64)(MYGINT64_MAX) - (gint64)(b) < (gint64)(a) ? -1 : 0 \
: (gint64)(MYGINT64_MIN) - (gint64)(b) > (gint64)(a) ? +1 : 0
(gint64)(b) >= 0 ? (gint64)(G_MAXINT64) - (gint64)(b) < (gint64)(a) ? -1 : 0 \
: (gint64)(G_MININT64) - (gint64)(b) > (gint64)(a) ? +1 : 0

#define CHECK_SUB_OVERFLOW64(a,b) \
(gint64)(b) < 0 ? (gint64)(MYGINT64_MAX) + (gint64)(b) < (gint64)(a) ? -1 : 0 \
: (gint64)(MYGINT64_MIN) + (gint64)(b) > (gint64)(a) ? +1 : 0
(gint64)(b) < 0 ? (gint64)(G_MAXINT64) + (gint64)(b) < (gint64)(a) ? -1 : 0 \
: (gint64)(G_MININT64) + (gint64)(b) > (gint64)(a) ? +1 : 0

#define CHECK_ADD_OVERFLOW64_UN(a,b) \
(guint64)(MYGUINT64_MAX) - (guint64)(b) < (guint64)(a) ? -1 : 0
(guint64)(G_MAXUINT64) - (guint64)(b) < (guint64)(a) ? -1 : 0

#define CHECK_SUB_OVERFLOW64_UN(a,b) \
(guint64)(a) < (guint64)(b) ? -1 : 0
Expand All @@ -1549,28 +1540,28 @@ get_trace_ips (MonoDomain *domain, InterpFrame *top)
#define CHECK_MUL_OVERFLOW(a,b) \
((gint32)(a) == 0) || ((gint32)(b) == 0) ? 0 : \
(((gint32)(a) > 0) && ((gint32)(b) == -1)) ? FALSE : \
(((gint32)(a) < 0) && ((gint32)(b) == -1)) ? (a == - MYGINT32_MAX) : \
(((gint32)(a) > 0) && ((gint32)(b) > 0)) ? (gint32)(a) > ((MYGINT32_MAX) / (gint32)(b)) : \
(((gint32)(a) > 0) && ((gint32)(b) < 0)) ? (gint32)(a) > ((MYGINT32_MIN) / (gint32)(b)) : \
(((gint32)(a) < 0) && ((gint32)(b) > 0)) ? (gint32)(a) < ((MYGINT32_MIN) / (gint32)(b)) : \
(gint32)(a) < ((MYGINT32_MAX) / (gint32)(b))
(((gint32)(a) < 0) && ((gint32)(b) == -1)) ? (a == G_MININT32) : \
(((gint32)(a) > 0) && ((gint32)(b) > 0)) ? (gint32)(a) > ((G_MAXINT32) / (gint32)(b)) : \
(((gint32)(a) > 0) && ((gint32)(b) < 0)) ? (gint32)(a) > ((G_MININT32) / (gint32)(b)) : \
(((gint32)(a) < 0) && ((gint32)(b) > 0)) ? (gint32)(a) < ((G_MININT32) / (gint32)(b)) : \
(gint32)(a) < ((G_MAXINT32) / (gint32)(b))

#define CHECK_MUL_OVERFLOW_UN(a,b) \
((guint32)(a) == 0) || ((guint32)(b) == 0) ? 0 : \
(guint32)(b) > ((MYGUINT32_MAX) / (guint32)(a))
(guint32)(b) > ((G_MAXUINT32) / (guint32)(a))

#define CHECK_MUL_OVERFLOW64(a,b) \
((gint64)(a) == 0) || ((gint64)(b) == 0) ? 0 : \
(((gint64)(a) > 0) && ((gint64)(b) == -1)) ? FALSE : \
(((gint64)(a) < 0) && ((gint64)(b) == -1)) ? (a == - MYGINT64_MAX) : \
(((gint64)(a) > 0) && ((gint64)(b) > 0)) ? (gint64)(a) > ((MYGINT64_MAX) / (gint64)(b)) : \
(((gint64)(a) > 0) && ((gint64)(b) < 0)) ? (gint64)(a) > ((MYGINT64_MIN) / (gint64)(b)) : \
(((gint64)(a) < 0) && ((gint64)(b) > 0)) ? (gint64)(a) < ((MYGINT64_MIN) / (gint64)(b)) : \
(gint64)(a) < ((MYGINT64_MAX) / (gint64)(b))
(((gint64)(a) < 0) && ((gint64)(b) == -1)) ? (a == G_MININT64) : \
(((gint64)(a) > 0) && ((gint64)(b) > 0)) ? (gint64)(a) > ((G_MAXINT64) / (gint64)(b)) : \
(((gint64)(a) > 0) && ((gint64)(b) < 0)) ? (gint64)(a) > ((G_MININT64) / (gint64)(b)) : \
(((gint64)(a) < 0) && ((gint64)(b) > 0)) ? (gint64)(a) < ((G_MININT64) / (gint64)(b)) : \
(gint64)(a) < ((G_MAXINT64) / (gint64)(b))

#define CHECK_MUL_OVERFLOW64_UN(a,b) \
((guint64)(a) == 0) || ((guint64)(b) == 0) ? 0 : \
(guint64)(b) > ((MYGUINT64_MAX) / (guint64)(a))
(guint64)(b) > ((G_MAXUINT64) / (guint64)(a))

#if SIZEOF_VOID_P == 4
#define CHECK_MUL_OVERFLOW_NAT(a,b) CHECK_MUL_OVERFLOW(a,b)
Expand Down Expand Up @@ -4346,9 +4337,9 @@ interp_exec_method_full (InterpFrame *frame, ThreadContext *context, guint16 *st
MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_CONV_OVF_I4_UN_R8)
if (sp [-1].data.f < 0 || sp [-1].data.f > MYGUINT32_MAX)
if (sp [-1].data.f < 0 || sp [-1].data.f > G_MAXINT32)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.i = (guint32)sp [-1].data.f;
sp [-1].data.i = (gint32)sp [-1].data.f;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_U8_I4)
Expand All @@ -4363,27 +4354,32 @@ interp_exec_method_full (InterpFrame *frame, ThreadContext *context, guint16 *st
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_I8_U8)
if ((guint64) sp [-1].data.l > MYGINT64_MAX)
if ((guint64) sp [-1].data.l > G_MAXINT64)
THROW_EX (mono_get_exception_overflow (), ip);
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_U8_R8)
MINT_IN_CASE(MINT_CONV_OVF_I8_UN_R8)
if (sp [-1].data.f < 0 || sp [-1].data.f > MYGINT64_MAX)
if (sp [-1].data.f < 0 || sp [-1].data.f > G_MAXUINT64)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.l = (guint64)sp [-1].data.f;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_I8_UN_R8)
if (sp [-1].data.f < 0 || sp [-1].data.f > G_MAXINT64)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.l = (gint64)sp [-1].data.f;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_I8_R8)
if (sp [-1].data.f < MYGINT64_MIN || sp [-1].data.f > MYGINT64_MAX)
if (sp [-1].data.f < G_MININT64 || sp [-1].data.f > G_MAXINT64)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.l = (gint64)sp [-1].data.f;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_I4_UN_I8)
if ((mono_u)sp [-1].data.l > MYGUINT32_MAX)
if ((guint64)sp [-1].data.l > G_MAXINT32)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.i = (mono_u)sp [-1].data.l;
sp [-1].data.i = (gint32)sp [-1].data.l;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_BOX) {
Expand Down Expand Up @@ -4664,19 +4660,19 @@ interp_exec_method_full (InterpFrame *frame, ThreadContext *context, guint16 *st
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_I4_I8)
if (sp [-1].data.l < MYGINT32_MIN || sp [-1].data.l > MYGINT32_MAX)
if (sp [-1].data.l < G_MININT32 || sp [-1].data.l > G_MAXINT32)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.i = (gint32) sp [-1].data.l;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_I4_U8)
if (sp [-1].data.l < 0 || sp [-1].data.l > MYGINT32_MAX)
if (sp [-1].data.l < 0 || sp [-1].data.l > G_MAXINT32)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.i = (gint32) sp [-1].data.l;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_I4_R8)
if (sp [-1].data.f < MYGINT32_MIN || sp [-1].data.f > MYGINT32_MAX)
if (sp [-1].data.f < G_MININT32 || sp [-1].data.f > G_MAXINT32)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.i = (gint32) sp [-1].data.f;
++ip;
Expand All @@ -4687,81 +4683,115 @@ interp_exec_method_full (InterpFrame *frame, ThreadContext *context, guint16 *st
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_U4_I8)
if (sp [-1].data.l < 0 || sp [-1].data.l > MYGUINT32_MAX)
if (sp [-1].data.l < 0 || sp [-1].data.l > G_MAXUINT32)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.i = (guint32) sp [-1].data.l;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_U4_R8)
if (sp [-1].data.f < 0 || sp [-1].data.f > MYGUINT32_MAX)
if (sp [-1].data.f < 0 || sp [-1].data.f > G_MAXUINT32)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.i = (guint32) sp [-1].data.f;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_I2_I4)
if (sp [-1].data.i < -32768 || sp [-1].data.i > 32767)
if (sp [-1].data.i < G_MININT16 || sp [-1].data.i > G_MAXINT16)
THROW_EX (mono_get_exception_overflow (), ip);
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_I2_U4)
if (sp [-1].data.i < 0 || sp [-1].data.i > G_MAXINT16)
THROW_EX (mono_get_exception_overflow (), ip);
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_I2_I8)
if (sp [-1].data.l < -32768 || sp [-1].data.l > 32767)
if (sp [-1].data.l < G_MININT16 || sp [-1].data.l > G_MAXINT16)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.i = (gint16) sp [-1].data.l;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_I2_U8)
if (sp [-1].data.l < 0 || sp [-1].data.l > G_MAXINT16)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.i = (gint16) sp [-1].data.l;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_I2_R8)
if (sp [-1].data.f < -32768 || sp [-1].data.f > 32767)
if (sp [-1].data.f < G_MININT16 || sp [-1].data.f > G_MAXINT16)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.i = (gint16) sp [-1].data.f;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_I2_UN_R8)
if (sp [-1].data.f < 0 || sp [-1].data.f > G_MAXINT16)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.i = (gint16) sp [-1].data.f;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_U2_I4)
if (sp [-1].data.i < 0 || sp [-1].data.i > 65535)
if (sp [-1].data.i < 0 || sp [-1].data.i > G_MAXUINT16)
THROW_EX (mono_get_exception_overflow (), ip);
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_U2_I8)
if (sp [-1].data.l < 0 || sp [-1].data.l > 65535)
if (sp [-1].data.l < 0 || sp [-1].data.l > G_MAXUINT16)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.i = (guint16) sp [-1].data.l;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_U2_R8)
if (sp [-1].data.f < 0 || sp [-1].data.f > 65535)
if (sp [-1].data.f < 0 || sp [-1].data.f > G_MAXUINT16)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.i = (guint16) sp [-1].data.f;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_I1_I4)
if (sp [-1].data.i < -128 || sp [-1].data.i > 127)
if (sp [-1].data.i < G_MININT8 || sp [-1].data.i > G_MAXINT8)
THROW_EX (mono_get_exception_overflow (), ip);
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_I1_U4)
if (sp [-1].data.i < 0 || sp [-1].data.i > G_MAXINT8)
THROW_EX (mono_get_exception_overflow (), ip);
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_I1_I8)
if (sp [-1].data.l < -128 || sp [-1].data.l > 127)
if (sp [-1].data.l < G_MININT8 || sp [-1].data.l > G_MAXINT8)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.i = (gint8) sp [-1].data.l;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_I1_U8)
if (sp [-1].data.l < 0 || sp [-1].data.l > G_MAXINT8)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.i = (gint8) sp [-1].data.l;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_I1_R8)
if (sp [-1].data.f < -128 || sp [-1].data.f > 127)
if (sp [-1].data.f < G_MININT8 || sp [-1].data.f > G_MAXINT8)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.i = (gint8) sp [-1].data.f;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_I1_UN_R8)
if (sp [-1].data.f < 0 || sp [-1].data.f > G_MAXINT8)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.i = (gint8) sp [-1].data.f;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_U1_I4)
if (sp [-1].data.i < 0 || sp [-1].data.i > 255)
if (sp [-1].data.i < 0 || sp [-1].data.i > G_MAXUINT8)
THROW_EX (mono_get_exception_overflow (), ip);
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_U1_I8)
if (sp [-1].data.l < 0 || sp [-1].data.l > 255)
if (sp [-1].data.l < 0 || sp [-1].data.l > G_MAXUINT8)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.i = (guint8) sp [-1].data.l;
++ip;
MINT_IN_BREAK;
MINT_IN_CASE(MINT_CONV_OVF_U1_R8)
if (sp [-1].data.f < 0 || sp [-1].data.f > 255)
if (sp [-1].data.f < 0 || sp [-1].data.f > G_MAXUINT8)
THROW_EX (mono_get_exception_overflow (), ip);
sp [-1].data.i = (guint8) sp [-1].data.f;
++ip;
Expand Down
8 changes: 8 additions & 0 deletions mono/mini/interp/mintops.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,10 @@ OPDEF(MINT_CONV_OVF_I1_I4, "conv.ovf.i1.i4", 1, MintOpNoArgs)
OPDEF(MINT_CONV_OVF_I1_I8, "conv.ovf.i1.i8", 1, MintOpNoArgs)
OPDEF(MINT_CONV_OVF_I1_R8, "conv.ovf.i1.r8", 1, MintOpNoArgs)

OPDEF(MINT_CONV_OVF_I1_U4, "conv.ovf.i1.u4", 1, MintOpNoArgs)
OPDEF(MINT_CONV_OVF_I1_U8, "conv.ovf.i1.u8", 1, MintOpNoArgs)
OPDEF(MINT_CONV_OVF_I1_UN_R8, "conv.ovf.i1.un.r8", 1, MintOpNoArgs)

OPDEF(MINT_CONV_OVF_U1_I4, "conv.ovf.u1.i4", 1, MintOpNoArgs)
OPDEF(MINT_CONV_OVF_U1_I8, "conv.ovf.u1.i8", 1, MintOpNoArgs)
OPDEF(MINT_CONV_OVF_U1_R8, "conv.ovf.u1.r8", 1, MintOpNoArgs)
Expand All @@ -461,6 +465,10 @@ OPDEF(MINT_CONV_OVF_I2_I4, "conv.ovf.i2.i4", 1, MintOpNoArgs)
OPDEF(MINT_CONV_OVF_I2_I8, "conv.ovf.i2.i8", 1, MintOpNoArgs)
OPDEF(MINT_CONV_OVF_I2_R8, "conv.ovf.i2.r8", 1, MintOpNoArgs)

OPDEF(MINT_CONV_OVF_I2_U4, "conv.ovf.i2.u4", 1, MintOpNoArgs)
OPDEF(MINT_CONV_OVF_I2_U8, "conv.ovf.i2.u8", 1, MintOpNoArgs)
OPDEF(MINT_CONV_OVF_I2_UN_R8, "conv.ovf.i2.un.r8", 1, MintOpNoArgs)

OPDEF(MINT_CONV_OVF_U2_I4, "conv.ovf.u2.i4", 1, MintOpNoArgs)
OPDEF(MINT_CONV_OVF_U2_I8, "conv.ovf.u2.i8", 1, MintOpNoArgs)
OPDEF(MINT_CONV_OVF_U2_R8, "conv.ovf.u2.r8", 1, MintOpNoArgs)
Expand Down
20 changes: 12 additions & 8 deletions mono/mini/interp/transform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4028,24 +4028,26 @@ generate (MonoMethod *method, MonoMethodHeader *header, InterpMethod *rtm, unsig
break;
}
case CEE_CONV_OVF_I1:
case CEE_CONV_OVF_I1_UN:
case CEE_CONV_OVF_I1_UN: {
gboolean is_un = *td->ip == CEE_CONV_OVF_I1_UN;
CHECK_STACK (td, 1);
switch (td->sp [-1].type) {
case STACK_TYPE_R8:
ADD_CODE(td, MINT_CONV_OVF_I1_R8);
ADD_CODE(td, is_un ? MINT_CONV_OVF_I1_UN_R8 : MINT_CONV_OVF_I1_R8);
break;
case STACK_TYPE_I4:
ADD_CODE(td, MINT_CONV_OVF_I1_I4);
ADD_CODE(td, is_un ? MINT_CONV_OVF_I1_U4 : MINT_CONV_OVF_I1_I4);
break;
case STACK_TYPE_I8:
ADD_CODE(td, MINT_CONV_OVF_I1_I8);
ADD_CODE(td, is_un ? MINT_CONV_OVF_I1_U8 : MINT_CONV_OVF_I1_I8);
break;
default:
g_assert_not_reached ();
}
++td->ip;
SET_SIMPLE_TYPE(td->sp - 1, STACK_TYPE_I4);
break;
}
case CEE_CONV_OVF_U1:
case CEE_CONV_OVF_U1_UN:
CHECK_STACK (td, 1);
Expand All @@ -4066,24 +4068,26 @@ generate (MonoMethod *method, MonoMethodHeader *header, InterpMethod *rtm, unsig
SET_SIMPLE_TYPE(td->sp - 1, STACK_TYPE_I4);
break;
case CEE_CONV_OVF_I2:
case CEE_CONV_OVF_I2_UN:
case CEE_CONV_OVF_I2_UN: {
gboolean is_un = *td->ip == CEE_CONV_OVF_I2_UN;
CHECK_STACK (td, 1);
switch (td->sp [-1].type) {
case STACK_TYPE_R8:
ADD_CODE(td, MINT_CONV_OVF_I2_R8);
ADD_CODE(td, is_un ? MINT_CONV_OVF_I2_UN_R8 : MINT_CONV_OVF_I2_R8);
break;
case STACK_TYPE_I4:
ADD_CODE(td, MINT_CONV_OVF_I2_I4);
ADD_CODE(td, is_un ? MINT_CONV_OVF_I2_U4 : MINT_CONV_OVF_I2_I4);
break;
case STACK_TYPE_I8:
ADD_CODE(td, MINT_CONV_OVF_I2_I8);
ADD_CODE(td, is_un ? MINT_CONV_OVF_I2_U8 : MINT_CONV_OVF_I2_I8);
break;
default:
g_assert_not_reached ();
}
++td->ip;
SET_SIMPLE_TYPE(td->sp - 1, STACK_TYPE_I4);
break;
}
case CEE_CONV_OVF_U2_UN:
case CEE_CONV_OVF_U2:
CHECK_STACK (td, 1);
Expand Down