projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Merge branch 'master' of https://github.com/mono/mono"
[mono.git]
/
mono
/
mini
/
mini-codegen.c
diff --git
a/mono/mini/mini-codegen.c
b/mono/mini/mini-codegen.c
index 6e5bf2f8586b331670c76f02325d0cb7585f3d95..48fac064cbdc675bdf85b5d7a42d143688b809bb 100644
(file)
--- a/
mono/mini/mini-codegen.c
+++ b/
mono/mini/mini-codegen.c
@@
-1065,9
+1065,8
@@
assign_reg (MonoCompile *cfg, MonoRegState *rs, int reg, int hreg, int bank)
else {
g_assert (reg >= MONO_MAX_IREGS);
g_assert (hreg < MONO_MAX_IREGS);
else {
g_assert (reg >= MONO_MAX_IREGS);
g_assert (hreg < MONO_MAX_IREGS);
-#if
!defined(TARGET_ARM) && !defined(TARGET_ARM64)
+#if
ndef TARGET_ARM
/* this seems to trigger a gcc compilation bug sometime (hreg is 0) */
/* this seems to trigger a gcc compilation bug sometime (hreg is 0) */
- /* On arm64, rgctx_reg is a global hreg, and it is used to pass an argument */
g_assert (! is_global_ireg (hreg));
#endif
g_assert (! is_global_ireg (hreg));
#endif
@@
-1125,7
+1124,7
@@
mono_local_regalloc (MonoCompile *cfg, MonoBasicBlock *bb)
desc_to_fixed_reg_inited = TRUE;
/* Validate the cpu description against the info in mini-ops.h */
desc_to_fixed_reg_inited = TRUE;
/* Validate the cpu description against the info in mini-ops.h */
-#if defined(TARGET_AMD64) || defined(TARGET_X86) || defined(TARGET_ARM)
|| defined(TARGET_ARM64)
+#if defined(TARGET_AMD64) || defined(TARGET_X86) || defined(TARGET_ARM)
for (i = OP_LOAD; i < OP_LAST; ++i) {
const char *ispec;
for (i = OP_LOAD; i < OP_LAST; ++i) {
const char *ispec;