projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2010-06-23 Miguel de Icaza <miguel@novell.com>
[mono.git]
/
mono
/
mini
/
tramp-mips.c
diff --git
a/mono/mini/tramp-mips.c
b/mono/mini/tramp-mips.c
index b2947d385e2d090aaa50845699047a5c24b46c7f..f8ae3eff822894bb4933d29664a05881ffac4a6a 100644
(file)
--- a/
mono/mini/tramp-mips.c
+++ b/
mono/mini/tramp-mips.c
@@
-99,7
+99,7
@@
mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr)
}
void
}
void
-mono_arch_patch_plt_entry (guint8 *code, guint8 *addr)
+mono_arch_patch_plt_entry (guint8 *code, g
pointer *got, mgreg_t *regs, g
uint8 *addr)
{
g_assert_not_reached ();
}
{
g_assert_not_reached ();
}
@@
-115,7
+115,7
@@
mono_arch_patch_plt_entry (guint8 *code, guint8 *addr)
gpointer
gpointer
-mono_arch_get_vcall_slot (guint8 *code_ptr,
gpointer
*regs, int *displacement)
+mono_arch_get_vcall_slot (guint8 *code_ptr,
mgreg_t
*regs, int *displacement)
{
char *o = NULL;
char *vtable = NULL;
{
char *o = NULL;
char *vtable = NULL;
@@
-177,13
+177,13
@@
mono_arch_get_vcall_slot (guint8 *code_ptr, gpointer *regs, int *displacement)
}
void
}
void
-mono_arch_nullify_plt_entry (guint8 *code)
+mono_arch_nullify_plt_entry (guint8 *code
, mgreg_t *regs
)
{
g_assert_not_reached ();
}
void
{
g_assert_not_reached ();
}
void
-mono_arch_nullify_class_init_trampoline (guint8 *code,
gssize
*regs)
+mono_arch_nullify_class_init_trampoline (guint8 *code,
mgreg_t
*regs)
{
guint32 *code32 = (guint32*)code;
{
guint32 *code32 = (guint32*)code;
@@
-217,12
+217,16
@@
mono_arch_nullify_class_init_trampoline (guint8 *code, gssize *regs)
* -------------------
*/
guchar*
* -------------------
*/
guchar*
-mono_arch_create_
trampoline_code (MonoTrampolineType tramp_type
)
+mono_arch_create_
generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInfo **info, gboolean aot
)
{
guint8 *buf, *tramp, *code = NULL;
int i, lmf;
int max_code_len = 768;
{
guint8 *buf, *tramp, *code = NULL;
int i, lmf;
int max_code_len = 768;
+ g_assert (!aot);
+ if (info)
+ *info = NULL;
+
/* Now we'll create in 'buf' the MIPS trampoline code. This
is the trampoline code common to all methods */
/* Now we'll create in 'buf' the MIPS trampoline code. This
is the trampoline code common to all methods */
@@
-379,7
+383,7
@@
mono_arch_create_specific_trampoline (gpointer arg1, MonoTrampolineType tramp_ty
}
gpointer
}
gpointer
-mono_arch_create_rgctx_lazy_fetch_trampoline (guint32
encoded_offse
t)
+mono_arch_create_rgctx_lazy_fetch_trampoline (guint32
slot, MonoTrampInfo **info, gboolean ao
t)
{
/* FIXME: implement! */
g_assert_not_reached ();
{
/* FIXME: implement! */
g_assert_not_reached ();
@@
-387,7
+391,7
@@
mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 encoded_offset)
}
gpointer
}
gpointer
-mono_arch_create_generic_class_init_trampoline (
void
)
+mono_arch_create_generic_class_init_trampoline (
MonoTrampInfo **info, gboolean aot
)
{
/* FIXME: implement! */
g_assert_not_reached ();
{
/* FIXME: implement! */
g_assert_not_reached ();