projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #5714 from alexischr/update_bockbuild
[mono.git]
/
mono
/
mini
/
mini-native-types.c
diff --git
a/mono/mini/mini-native-types.c
b/mono/mini/mini-native-types.c
index 4bf5a79bdc606ae04c9309cf003bbb3d73f015db..3f0540ff5fe527eeb7de9fe776ef5554110f5ae1 100644
(file)
--- a/
mono/mini/mini-native-types.c
+++ b/
mono/mini/mini-native-types.c
@@
-1,5
+1,6
@@
-/*
- * magic-types.c: intrinsics for variable sized int/floats
+/**
+ * \file
+ * intrinsics for variable sized int/floats
*
* Author:
* Rodrigo Kumpera (kumpera@gmail.com)
*
* Author:
* Rodrigo Kumpera (kumpera@gmail.com)
@@
-125,9
+126,6
@@
static const MagicTypeInfo type_info[] = {
{ 2, STACK_R8, STACK_R8, STACK_R8, OP_FCONV_TO_R8, OP_FCONV_TO_R4, OP_FMOVE, 0, 0, OP_PT_STORE_FP_MEMBASE_REG, 0 },
};
{ 2, STACK_R8, STACK_R8, STACK_R8, OP_FCONV_TO_R8, OP_FCONV_TO_R4, OP_FMOVE, 0, 0, OP_PT_STORE_FP_MEMBASE_REG, 0 },
};
-static inline gboolean mono_class_is_magic_int (MonoClass *klass);
-static inline gboolean mono_class_is_magic_float (MonoClass *klass);
-
static inline gboolean
type_size (MonoCompile *cfg, MonoType *type)
static inline gboolean
type_size (MonoCompile *cfg, MonoType *type)
@@
-351,10
+349,15
@@
mono_class_is_magic_assembly (MonoClass *klass)
return TRUE;
if (!strcmp ("Xamarin.WatchOS", klass->image->assembly_name))
return TRUE;
return TRUE;
if (!strcmp ("Xamarin.WatchOS", klass->image->assembly_name))
return TRUE;
+ /* regression test suite */
+ if (!strcmp ("builtin-types", klass->image->assembly_name))
+ return TRUE;
+ if (!strcmp ("mini_tests", klass->image->assembly_name))
+ return TRUE;
return FALSE;
}
return FALSE;
}
-
static inline
gboolean
+gboolean
mono_class_is_magic_int (MonoClass *klass)
{
static MonoClass *magic_nint_class;
mono_class_is_magic_int (MonoClass *klass)
{
static MonoClass *magic_nint_class;
@@
-387,7
+390,7
@@
mono_class_is_magic_int (MonoClass *klass)
return FALSE;
}
return FALSE;
}
-
static inline
gboolean
+gboolean
mono_class_is_magic_float (MonoClass *klass)
{
static MonoClass *magic_nfloat_class;
mono_class_is_magic_float (MonoClass *klass)
{
static MonoClass *magic_nfloat_class;