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.

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

Unity master sync il2cpp #1115

Merged
merged 23 commits into from
Jan 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0a730c8
Fix html5 build by adding forward declares to referenced APIs
juj Sep 27, 2018
fce7192
Use mono_gc_wbarrier_set_field instead of il2cpp_gc_wbarrier_set_fiel…
jechter Oct 16, 2018
f0fcf2e
Use mono_gc_wbarrier_generic_store instead of mono_gc_wbarrier_set_field
jechter Oct 17, 2018
c1ebb8f
Reduce codegen overhead for debugger to single check. Avoid retrievin…
joncham Oct 23, 2018
3b831f7
Store method pointer, invoker indices, and reverse pinvoke indices in…
joncham Nov 14, 2018
31422d0
Make the global break check volatile
Nov 16, 2018
7c74147
Remove Class From Codegen headers
Nov 27, 2018
afa21ce
Don't shutdown in mono_runtime_try_shutdown
Nov 30, 2018
c1aa297
Fix a build error in Tiny debugger tests
Dec 1, 2018
6871e3d
Remove all UNITY_TINY #if statements from il2cpp-stubs.cpp
Nov 21, 2018
4bd7064
Tiny debugger tests
Nov 26, 2018
894596a
Remove a stray # character
Dec 3, 2018
0bd828b
Move the exit code setting back after try_shutdown
Dec 3, 2018
dc5f82b
Don't shutdown in mono_runtime_try_shutdown
Nov 30, 2018
359132d
Shutdown the runtime properly for Tiny with the debugger
Dec 3, 2018
2188d96
Produce debugger information per assembly.
joncham Nov 21, 2018
f60719b
Remove the <limits> and <vector> headers from being included in codegen
Dec 10, 2018
44ce5b7
Rename UNITY_TINY defines to IL2CPP_TINY
Dec 12, 2018
0e2663d
Don't attempt to stop threads on exit
Dec 14, 2018
c39d8e9
cache pause point active state
jechter Dec 4, 2018
a782c27
Inline Sequence Point checks; hard code sequence point reference into…
jechter Dec 4, 2018
0299a6b
Remove no longer needed debugger check code
jechter Dec 17, 2018
46ed83e
Use gboolean rather than C++ bool type in Mono C code.
joncham Jan 2, 2019
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: 1 addition & 0 deletions mono/metadata/il2cpp-compat-metadata.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ SgenDescriptor il2cpp_mono_gc_make_root_descr_all_refs(int numbits);
MonoGCDescriptor il2cpp_mono_gc_make_vector_descr (void);
void* il2cpp_mono_gc_alloc_fixed (size_t size, void* descr, MonoGCRootSource source, void *key, const char *msg);
gboolean il2cpp_mono_gc_is_moving();
void il2cpp_mono_gc_deregister_root(char* addr);

typedef void* (*MonoGCLockedCallbackFunc) (void *data);
void* il2cpp_mono_gc_invoke_with_gc_lock (MonoGCLockedCallbackFunc func, void *data);
Expand Down
3 changes: 3 additions & 0 deletions mono/metadata/metadata-internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,9 @@ struct _MonoImage {
/* If the raw data was allocated from a source such as mmap, the allocator may store resource tracking information here. */
void *raw_data_handle;
char *raw_data;
#ifdef IL2CPP_ON_MONO
void* il2cpp_codegen_handle;
#endif
guint32 raw_data_len;
guint8 raw_buffer_used : 1;
guint8 raw_data_allocated : 1;
Expand Down
2 changes: 2 additions & 0 deletions mono/metadata/mono-hash.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
#include <mono/utils/mono-threads-coop.h>
#include <mono/utils/unlocked.h>

void il2cpp_mono_gc_wbarrier_generic_store (void* ptr, MonoObject* value);

gint32 mono_g_hash_table_max_chain_length;

struct _MonoGHashTable {
Expand Down
Loading