diff options
| author | Vladimir Marko <vmarko@google.com> | 2015-01-26 14:46:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-26 14:46:13 +0000 |
| commit | 3c40d38eadeb5ea7c0733f6a40816061db8c86f8 (patch) | |
| tree | 3e000034c018a77970ce9d0ff5ea4d0844ef6355 | |
| parent | 76d032bacd65e396609631bb6aca3a90a80116f7 (diff) | |
| parent | 34eda1dd66b92a361797c63d57fa19e83c08a1b4 (diff) | |
| download | art-3c40d38eadeb5ea7c0733f6a40816061db8c86f8.tar.gz art-3c40d38eadeb5ea7c0733f6a40816061db8c86f8.tar.bz2 art-3c40d38eadeb5ea7c0733f6a40816061db8c86f8.zip | |
Merge "ART: Fix asm literals for Mac builds."
| -rw-r--r-- | runtime/arch/x86/quick_entrypoints_x86.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/arch/x86/quick_entrypoints_x86.S b/runtime/arch/x86/quick_entrypoints_x86.S index c5e19142ae..151f51febc 100644 --- a/runtime/arch/x86/quick_entrypoints_x86.S +++ b/runtime/arch/x86/quick_entrypoints_x86.S @@ -457,7 +457,7 @@ DEFINE_FUNCTION art_quick_invoke_stub // Enumerate the possible cases for loading GPRS. // edx (and maybe ebx): SKIP_OVER_FLOATS .Lgpr_setup_finished - cmpb MACRO_LITERAL(74), %al // if (al == 'J') goto FOUND_LONG + cmpb LITERAL(74), %al // if (al == 'J') goto FOUND_LONG je .LfirstLong // Must be an integer value. movl (%edi), %edx @@ -549,7 +549,7 @@ DEFINE_FUNCTION art_quick_invoke_static_stub // Enumerate the possible cases for loading GPRS. // ecx (and maybe edx) SKIP_OVER_FLOATS .Lgpr_setup_finished2 - cmpb MACRO_LITERAL(74), %al // if (al == 'J') goto FOUND_LONG + cmpb LITERAL(74), %al // if (al == 'J') goto FOUND_LONG je .LfirstLong2 // Must be an integer value. Load into ECX. movl (%edi), %ecx @@ -557,7 +557,7 @@ DEFINE_FUNCTION art_quick_invoke_static_stub // Now check edx (and maybe ebx). SKIP_OVER_FLOATS .Lgpr_setup_finished2 - cmpb MACRO_LITERAL(74), %al // if (al == 'J') goto FOUND_LONG + cmpb LITERAL(74), %al // if (al == 'J') goto FOUND_LONG je .LSecondLong2 // Must be an integer. Load into EDX. movl (%edi), %edx @@ -1375,7 +1375,7 @@ DEFINE_FUNCTION art_quick_generic_jni_trampoline // Tear down the callee-save frame. // Remove space for FPR args and EAX - addl MACRO_LITERAL(4 + 4 * 8), %esp + addl LITERAL(4 + 4 * 8), %esp CFI_ADJUST_CFA_OFFSET(-(4 + 4 * 8)) POP ecx @@ -1415,7 +1415,7 @@ DEFINE_FUNCTION art_quick_to_interpreter_bridge movd %edx, %xmm1 punpckldq %xmm1, %xmm0 - addl MACRO_LITERAL(48), %esp // Remove FPRs and EAX, ECX, EDX, EBX. + addl LITERAL(48), %esp // Remove FPRs and EAX, ECX, EDX, EBX. CFI_ADJUST_CFA_OFFSET(-48) POP ebp // Restore callee saves |