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 #4727 from BrzVlad/fix-xamarin-studio
[mono.git]
/
mono
/
metadata
/
domain-internals.h
diff --git
a/mono/metadata/domain-internals.h
b/mono/metadata/domain-internals.h
index 69e2a7cd689e3937b2b55f4947c3134460c694e4..bdab742092f8c75340cf6bbaf3054bcbe9582356 100644
(file)
--- a/
mono/metadata/domain-internals.h
+++ b/
mono/metadata/domain-internals.h
@@
-184,12
+184,22
@@
typedef struct {
int thunks_size;
} MonoThunkJitInfo;
int thunks_size;
} MonoThunkJitInfo;
+typedef struct {
+ guint8 *unw_info;
+ int unw_info_len;
+} MonoUnwindJitInfo;
+
typedef enum {
JIT_INFO_NONE = 0,
JIT_INFO_HAS_GENERIC_JIT_INFO = (1 << 0),
JIT_INFO_HAS_TRY_BLOCK_HOLES = (1 << 1),
JIT_INFO_HAS_ARCH_EH_INFO = (1 << 2),
typedef enum {
JIT_INFO_NONE = 0,
JIT_INFO_HAS_GENERIC_JIT_INFO = (1 << 0),
JIT_INFO_HAS_TRY_BLOCK_HOLES = (1 << 1),
JIT_INFO_HAS_ARCH_EH_INFO = (1 << 2),
- JIT_INFO_HAS_THUNK_INFO = (1 << 3)
+ JIT_INFO_HAS_THUNK_INFO = (1 << 3),
+ /*
+ * If this is set, the unwind info is stored in the structure, instead of being pointed to by the
+ * 'unwind_info' field.
+ */
+ JIT_INFO_HAS_UNWIND_INFO = (1 << 4)
} MonoJitInfoFlags;
struct _MonoJitInfo {
} MonoJitInfoFlags;
struct _MonoJitInfo {
@@
-217,6
+227,7
@@
struct _MonoJitInfo {
gboolean has_try_block_holes:1;
gboolean has_arch_eh_info:1;
gboolean has_thunk_info:1;
gboolean has_try_block_holes:1;
gboolean has_arch_eh_info:1;
gboolean has_thunk_info:1;
+ gboolean has_unwind_info:1;
gboolean from_aot:1;
gboolean from_llvm:1;
gboolean dbg_attrs_inited:1;
gboolean from_aot:1;
gboolean from_llvm:1;
gboolean dbg_attrs_inited:1;
@@
-531,6
+542,9
@@
mono_jit_info_get_arch_eh_info (MonoJitInfo *ji);
MonoThunkJitInfo*
mono_jit_info_get_thunk_info (MonoJitInfo *ji);
MonoThunkJitInfo*
mono_jit_info_get_thunk_info (MonoJitInfo *ji);
+MonoUnwindJitInfo*
+mono_jit_info_get_unwind_info (MonoJitInfo *ji);
+
/*
* Installs a new function which is used to return a MonoJitInfo for a method inside
* an AOT module.
/*
* Installs a new function which is used to return a MonoJitInfo for a method inside
* an AOT module.