Mercurial > hg > truffle

comparison src/cpu/x86/vm/c1_Runtime1_x86.cpp @ 8506:c3657d00e343

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
-Merge with tip
author Christos Kotselidis <christos.kotselidis@oracle.com>
date Thu, 21 Mar 2013 14:11:13 +0100
parents 86b4965f0c9a 5fc51c1ecdeb
children b9a918201d47
comparison
equal deleted inserted replaced
8505:dee7c8b578c7 8506:c3657d00e343
34 #include "prims/jvmtiExport.hpp" 34 #include "prims/jvmtiExport.hpp"
35 #include "register_x86.hpp" 35 #include "register_x86.hpp"
36 #include "runtime/sharedRuntime.hpp" 36 #include "runtime/sharedRuntime.hpp"
37 #include "runtime/signature.hpp" 37 #include "runtime/signature.hpp"
38 #include "runtime/vframeArray.hpp" 38 #include "runtime/vframeArray.hpp"
39 #include "utilities/macros.hpp"
39 #include "vmreg_x86.inline.hpp" 40 #include "vmreg_x86.inline.hpp"
40 41
41 42
42 // Implementation of StubAssembler 43 // Implementation of StubAssembler
43 44
1605 __ pop(rsi); 1606 __ pop(rsi);
1606 __ ret(0); 1607 __ ret(0);
1607 } 1608 }
1608 break; 1609 break;
1609 1610
1610 #ifndef SERIALGC 1611 #if INCLUDE_ALL_GCS
1611 case g1_pre_barrier_slow_id: 1612 case g1_pre_barrier_slow_id:
1612 { 1613 {
1613 StubFrame f(sasm, "g1_pre_barrier", dont_gc_arguments); 1614 StubFrame f(sasm, "g1_pre_barrier", dont_gc_arguments);
1614 // arg0 : previous value of memory 1615 // arg0 : previous value of memory
1615 1616
1802 __ pop(rcx); 1803 __ pop(rcx);
1803 __ pop(rax); 1804 __ pop(rax);
1804 1805
1805 } 1806 }
1806 break; 1807 break;
1807 #endif // !SERIALGC 1808 #endif // INCLUDE_ALL_GCS
1808 1809
1809 default: 1810 default:
1810 { StubFrame f(sasm, "unimplemented entry", dont_gc_arguments); 1811 { StubFrame f(sasm, "unimplemented entry", dont_gc_arguments);
1811 __ movptr(rax, (int)id); 1812 __ movptr(rax, (int)id);
1812 __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), rax); 1813 __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), rax);