Mercurial > hg > truffle
comparison src/cpu/x86/vm/c1_Runtime1_x86.cpp @ 5124:837a304d0ca8
C1 bugfix, fixed C1 compilation errors
author | Christian Haeubl <christian.haeubl@oracle.com> |
---|---|
date | Tue, 20 Mar 2012 11:45:21 -0700 |
parents | 422c979ff392 |
children | ec177db4a412 |
comparison
equal
deleted
inserted
replaced
5123:3d0556d10a2b | 5124:837a304d0ca8 |
---|---|
95 movptr(Address(thread, JavaThread::vm_result_offset()), NULL_WORD); | 95 movptr(Address(thread, JavaThread::vm_result_offset()), NULL_WORD); |
96 } | 96 } |
97 if (oop_result2->is_valid()) { | 97 if (oop_result2->is_valid()) { |
98 movptr(Address(thread, JavaThread::vm_result_2_offset()), NULL_WORD); | 98 movptr(Address(thread, JavaThread::vm_result_2_offset()), NULL_WORD); |
99 } | 99 } |
100 #ifdef GRAAL | |
100 // (thomaswue) Deoptimize in case of an exception. | 101 // (thomaswue) Deoptimize in case of an exception. |
101 restore_live_registers(this, false); | 102 restore_live_registers(this, false); |
102 movptr(Address(thread, Thread::pending_exception_offset()), NULL_WORD); | 103 movptr(Address(thread, Thread::pending_exception_offset()), NULL_WORD); |
103 leave(); | 104 leave(); |
104 movl(rscratch1, Deoptimization::make_trap_request(Deoptimization::Reason_constraint, Deoptimization::Action_reinterpret)); | 105 movl(rscratch1, Deoptimization::make_trap_request(Deoptimization::Reason_constraint, Deoptimization::Action_reinterpret)); |
105 jump(RuntimeAddress(SharedRuntime::deopt_blob()->uncommon_trap())); | 106 jump(RuntimeAddress(SharedRuntime::deopt_blob()->uncommon_trap())); |
107 #else | |
108 if (frame_size() == no_frame_size) { | |
109 leave(); | |
110 jump(RuntimeAddress(StubRoutines::forward_exception_entry())); | |
111 } else if (_stub_id == Runtime1::forward_exception_id) { | |
112 should_not_reach_here(); | |
113 } else { | |
114 jump(RuntimeAddress(Runtime1::entry_for(Runtime1::forward_exception_id))); | |
115 } | |
116 #endif | |
106 bind(L); | 117 bind(L); |
107 } | 118 } |
108 // get oop results if there are any and reset the values in the thread | 119 // get oop results if there are any and reset the values in the thread |
109 if (oop_result1->is_valid()) { | 120 if (oop_result1->is_valid()) { |
110 movptr(oop_result1, Address(thread, JavaThread::vm_result_offset())); | 121 movptr(oop_result1, Address(thread, JavaThread::vm_result_offset())); |