Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
bingbingbingbing
mono
提交
ac09c9bb
M
mono
项目概览
bingbingbingbing
/
mono
与 Fork 源项目一致
从无法访问的项目Fork
通知
35
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
mono
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
ac09c9bb
编写于
8月 12, 2013
作者:
J
Jonathan Chambers
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #77 from Unity-Technologies/unity-4.2-staging
Unity 4.2 staging
上级
21f2c585
38a84f73
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
33 addition
and
11 deletion
+33
-11
build_classlibs_osx.pl
build_classlibs_osx.pl
+1
-1
build_runtime_osx.pl
build_runtime_osx.pl
+2
-2
mono/mini/aot-compiler.c
mono/mini/aot-compiler.c
+7
-7
mono/mini/debugger-agent.c
mono/mini/debugger-agent.c
+6
-0
mono/mini/method-to-ir.c
mono/mini/method-to-ir.c
+2
-0
mono/mini/mini.c
mono/mini/mini.c
+15
-1
未找到文件。
build_classlibs_osx.pl
浏览文件 @
ac09c9bb
...
@@ -33,7 +33,7 @@ if ($ENV{UNITY_THISISABUILDMACHINE}) {
...
@@ -33,7 +33,7 @@ if ($ENV{UNITY_THISISABUILDMACHINE}) {
$ENV
{'
C_INCLUDE_PATH
'}
=
"
$external_MONO_PREFIX
/include:
$external_GNOME_PREFIX
/include
";
$ENV
{'
C_INCLUDE_PATH
'}
=
"
$external_MONO_PREFIX
/include:
$external_GNOME_PREFIX
/include
";
$ENV
{'
ACLOCAL_PATH
'}
=
"
$external_MONO_PREFIX
/share/aclocal
";
$ENV
{'
ACLOCAL_PATH
'}
=
"
$external_MONO_PREFIX
/share/aclocal
";
$ENV
{'
PKG_CONFIG_PATH
'}
=
"
$external_MONO_PREFIX
/lib/pkgconfig:
$external_GNOME_PREFIX
/lib/pkgconfig
";
$ENV
{'
PKG_CONFIG_PATH
'}
=
"
$external_MONO_PREFIX
/lib/pkgconfig:
$external_GNOME_PREFIX
/lib/pkgconfig
";
$ENV
{'
PATH
'}
=
"
$external_MONO_PREFIX
/bin:
$ENV
{'PATH'}
";
$ENV
{'
PATH
'}
=
"
$external_MONO_PREFIX
/bin:
/usr/local/bin:
$ENV
{'PATH'}
";
}
else
{
}
else
{
print
"
not rmtree-ing
$root
/builds, as we're not on a buildmachine
\n
";
print
"
not rmtree-ing
$root
/builds, as we're not on a buildmachine
\n
";
}
}
...
...
build_runtime_osx.pl
浏览文件 @
ac09c9bb
...
@@ -104,9 +104,9 @@ for my $arch (@arches)
...
@@ -104,9 +104,9 @@ for my $arch (@arches)
#this will fail on a fresh working copy, so don't die on it.
#this will fail on a fresh working copy, so don't die on it.
system
("
make distclean
");
system
("
make distclean
");
system
("
autoreconf -i
")
eq
0
or
die
("
Failed autoreconfing eglib
")
;
system
("
autoreconf -i
");
chdir
("
$root
")
eq
1
or
die
("
failed to chdir 2
");
chdir
("
$root
")
eq
1
or
die
("
failed to chdir 2
");
system
("
autoreconf -i
")
eq
0
or
die
("
Failed autoreconfing mono
")
;
system
("
autoreconf -i
");
my
@autogenparams
=
();
my
@autogenparams
=
();
unshift
(
@autogenparams
,
"
--cache-file=osx.cache
");
unshift
(
@autogenparams
,
"
--cache-file=osx.cache
");
unshift
(
@autogenparams
,
"
--disable-mcs-build
");
unshift
(
@autogenparams
,
"
--disable-mcs-build
");
...
...
mono/mini/aot-compiler.c
浏览文件 @
ac09c9bb
...
@@ -4346,8 +4346,14 @@ emit_code (MonoAotCompile *acfg)
...
@@ -4346,8 +4346,14 @@ emit_code (MonoAotCompile *acfg)
emit_method_code
(
acfg
,
acfg
->
cfgs
[
i
]);
emit_method_code
(
acfg
,
acfg
->
cfgs
[
i
]);
}
}
sprintf
(
symbol
,
"methods_end"
);
emit_section_change
(
acfg
,
".text"
,
0
);
emit_global
(
acfg
,
symbol
,
FALSE
);
emit_alignment
(
acfg
,
8
);
emit_label
(
acfg
,
symbol
);
sprintf
(
symbol
,
"method_addresses"
);
sprintf
(
symbol
,
"method_addresses"
);
emit_section_change
(
acfg
,
".
text
"
,
1
);
emit_section_change
(
acfg
,
".
data
"
,
1
);
emit_global
(
acfg
,
symbol
,
FALSE
);
emit_global
(
acfg
,
symbol
,
FALSE
);
emit_alignment
(
acfg
,
8
);
emit_alignment
(
acfg
,
8
);
emit_label
(
acfg
,
symbol
);
emit_label
(
acfg
,
symbol
);
...
@@ -4365,12 +4371,6 @@ emit_code (MonoAotCompile *acfg)
...
@@ -4365,12 +4371,6 @@ emit_code (MonoAotCompile *acfg)
}
}
}
}
sprintf
(
symbol
,
"methods_end"
);
emit_section_change
(
acfg
,
".text"
,
0
);
emit_global
(
acfg
,
symbol
,
FALSE
);
emit_alignment
(
acfg
,
8
);
emit_label
(
acfg
,
symbol
);
sprintf
(
symbol
,
"method_offsets"
);
sprintf
(
symbol
,
"method_offsets"
);
emit_section_change
(
acfg
,
".text"
,
1
);
emit_section_change
(
acfg
,
".text"
,
1
);
emit_global
(
acfg
,
symbol
,
FALSE
);
emit_global
(
acfg
,
symbol
,
FALSE
);
...
...
mono/mini/debugger-agent.c
浏览文件 @
ac09c9bb
...
@@ -1015,7 +1015,13 @@ transport_handshake (void)
...
@@ -1015,7 +1015,13 @@ transport_handshake (void)
static
int
static
int
transport_accept
(
int
socket_fd
)
transport_accept
(
int
socket_fd
)
{
{
#ifdef __QNXNTO__
do
{
conn_fd
=
accept
(
socket_fd
,
NULL
,
NULL
);
}
while
(
conn_fd
==
-
1
&&
errno
==
EINTR
);
#else
conn_fd
=
accept
(
socket_fd
,
NULL
,
NULL
);
conn_fd
=
accept
(
socket_fd
,
NULL
,
NULL
);
#endif
if
(
conn_fd
==
-
1
)
{
if
(
conn_fd
==
-
1
)
{
fprintf
(
stderr
,
"debugger-agent: Unable to listen on %d
\n
"
,
socket_fd
);
fprintf
(
stderr
,
"debugger-agent: Unable to listen on %d
\n
"
,
socket_fd
);
}
else
{
}
else
{
...
...
mono/mini/method-to-ir.c
浏览文件 @
ac09c9bb
...
@@ -5485,6 +5485,8 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
...
@@ -5485,6 +5485,8 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
if
(
il_offsets
[
i
]
<
header
->
code_size
)
if
(
il_offsets
[
i
]
<
header
->
code_size
)
mono_bitset_set_fast
(
seq_point_locs
,
il_offsets
[
i
]);
mono_bitset_set_fast
(
seq_point_locs
,
il_offsets
[
i
]);
}
}
g_free
(
il_offsets
);
g_free
(
line_numbers
);
}
}
}
}
...
...
mono/mini/mini.c
浏览文件 @
ac09c9bb
...
@@ -5157,6 +5157,7 @@ mini_get_addr_from_ftnptr (gpointer descr)
...
@@ -5157,6 +5157,7 @@ mini_get_addr_from_ftnptr (gpointer descr)
}
}
static
void
runtime_invoke_info_free
(
gpointer
value
);
static
void
runtime_invoke_info_free
(
gpointer
value
);
static
void
seq_point_info_free
(
gpointer
value
);
static
void
static
void
mini_create_jit_domain_info
(
MonoDomain
*
domain
)
mini_create_jit_domain_info
(
MonoDomain
*
domain
)
...
@@ -5169,7 +5170,7 @@ mini_create_jit_domain_info (MonoDomain *domain)
...
@@ -5169,7 +5170,7 @@ mini_create_jit_domain_info (MonoDomain *domain)
info
->
delegate_trampoline_hash
=
g_hash_table_new
(
mono_aligned_addr_hash
,
NULL
);
info
->
delegate_trampoline_hash
=
g_hash_table_new
(
mono_aligned_addr_hash
,
NULL
);
info
->
llvm_vcall_trampoline_hash
=
g_hash_table_new
(
mono_aligned_addr_hash
,
NULL
);
info
->
llvm_vcall_trampoline_hash
=
g_hash_table_new
(
mono_aligned_addr_hash
,
NULL
);
info
->
runtime_invoke_hash
=
g_hash_table_new_full
(
mono_aligned_addr_hash
,
NULL
,
NULL
,
runtime_invoke_info_free
);
info
->
runtime_invoke_hash
=
g_hash_table_new_full
(
mono_aligned_addr_hash
,
NULL
,
NULL
,
runtime_invoke_info_free
);
info
->
seq_points
=
g_hash_table_new
(
mono_aligned_addr_hash
,
NULL
);
info
->
seq_points
=
g_hash_table_new
_full
(
mono_aligned_addr_hash
,
NULL
,
NULL
,
seq_point_info_free
);
info
->
arch_seq_points
=
g_hash_table_new
(
mono_aligned_addr_hash
,
NULL
);
info
->
arch_seq_points
=
g_hash_table_new
(
mono_aligned_addr_hash
,
NULL
);
domain
->
runtime_info
=
info
;
domain
->
runtime_info
=
info
;
...
@@ -5201,6 +5202,19 @@ runtime_invoke_info_free (gpointer value)
...
@@ -5201,6 +5202,19 @@ runtime_invoke_info_free (gpointer value)
g_free
(
info
);
g_free
(
info
);
}
}
static
void
seq_point_info_free
(
gpointer
value
)
{
int
i
=
0
;
MonoSeqPointInfo
*
info
=
(
MonoSeqPointInfo
*
)
value
;
for
(
i
=
0
;
i
<
info
->
len
;
++
i
)
{
SeqPoint
*
sp
=
&
info
->
seq_points
[
i
];
g_free
(
sp
->
next
);
}
g_free
(
info
);
}
static
void
static
void
mini_free_jit_domain_info
(
MonoDomain
*
domain
)
mini_free_jit_domain_info
(
MonoDomain
*
domain
)
{
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录