projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* RegistryKeyTest.cs: Modified GetValueNamesTest and GetSubKeyNamesTest
[mono.git]
/
mono
/
metadata
/
debug-helpers.c
diff --git
a/mono/metadata/debug-helpers.c
b/mono/metadata/debug-helpers.c
index f9d2d446952a0c9fec2f78706d2ad1a089ec2ed8..712b8023a039a25ff8f7d784e8525f7d0bdfc2a1 100644
(file)
--- a/
mono/metadata/debug-helpers.c
+++ b/
mono/metadata/debug-helpers.c
@@
-23,6
+23,7
@@
static const char *wrapper_type_names [] = {
"runtime-invoke",
"native-to-managed",
"managed-to-native",
"runtime-invoke",
"native-to-managed",
"managed-to-native",
+ "managed-to-managed",
"remoting-invoke",
"remoting-invoke-with-check",
"xdomain-invoke",
"remoting-invoke",
"remoting-invoke-with-check",
"xdomain-invoke",
@@
-39,7
+40,10
@@
static const char *wrapper_type_names [] = {
"stelemref",
"unbox",
"ldflda",
"stelemref",
"unbox",
"ldflda",
- "unknown"
+ "write-barrier",
+ "unknown",
+ "cominterop-invoke",
+ "cominterop"
};
static void
};
static void
@@
-337,11
+341,13
@@
dis_one (GString *str, MonoDisHelper *dh, MonoMethod *method, const unsigned cha
{
MonoMethodHeader *header = mono_method_get_header (method);
const MonoOpcode *opcode;
{
MonoMethodHeader *header = mono_method_get_header (method);
const MonoOpcode *opcode;
- guint32
i,
label, token;
+ guint32 label, token;
gint32 sval;
gint32 sval;
+ int i;
char *tmp;
char *tmp;
+ const unsigned char* il_code = mono_method_header_get_code (header, NULL, NULL);
- label = ip -
header->
code;
+ label = ip -
il_
code;
if (dh->indenter) {
tmp = dh->indenter (dh, method, label);
g_string_append (str, tmp);
if (dh->indenter) {
tmp = dh->indenter (dh, method, label);
g_string_append (str, tmp);
@@
-389,7
+395,7
@@
dis_one (GString *str, MonoDisHelper *dh, MonoMethod *method, const unsigned cha
sval = read32 (ip);
ip += 4;
if (dh->label_target)
sval = read32 (ip);
ip += 4;
if (dh->label_target)
- g_string_sprintfa (str, dh->label_target, ip + sval -
header->
code);
+ g_string_sprintfa (str, dh->label_target, ip + sval -
il_
code);
else
g_string_sprintfa (str, "%d", sval);
break;
else
g_string_sprintfa (str, "%d", sval);
break;
@@
-397,7
+403,7
@@
dis_one (GString *str, MonoDisHelper *dh, MonoMethod *method, const unsigned cha
sval = *(const signed char*)ip;
ip ++;
if (dh->label_target)
sval = *(const signed char*)ip;
ip ++;
if (dh->label_target)
- g_string_sprintfa (str, dh->label_target, ip + sval -
header->
code);
+ g_string_sprintfa (str, dh->label_target, ip + sval -
il_
code);
else
g_string_sprintfa (str, "%d", sval);
break;
else
g_string_sprintfa (str, "%d", sval);
break;
@@
-412,7
+418,7
@@
dis_one (GString *str, MonoDisHelper *dh, MonoMethod *method, const unsigned cha
g_string_append (str, ", ");
label = read32 (ip);
if (dh->label_target)
g_string_append (str, ", ");
label = read32 (ip);
if (dh->label_target)
- g_string_sprintfa (str, dh->label_target, end + label -
header->
code);
+ g_string_sprintfa (str, dh->label_target, end + label -
il_
code);
else
g_string_sprintfa (str, "%d", label);
ip += 4;
else
g_string_sprintfa (str, "%d", label);
ip += 4;