Mercurial > hg > graal-jvmci-8
comparison src/cpu/x86/vm/c1_LIRAssembler_x86.cpp @ 3960:f08d439fab8c
7089790: integrate bsd-port changes
Reviewed-by: kvn, twisti, jrose
Contributed-by: Kurt Miller <kurt@intricatesoftware.com>, Greg Lewis <glewis@eyesbeyond.com>, Jung-uk Kim <jkim@freebsd.org>, Christos Zoulas <christos@zoulas.com>, Landon Fuller <landonf@plausible.coop>, The FreeBSD Foundation <board@freebsdfoundation.org>, Michael Franz <mvfranz@gmail.com>, Roger Hoover <rhoover@apple.com>, Alexander Strange <astrange@apple.com>
author | never |
---|---|
date | Sun, 25 Sep 2011 16:03:29 -0700 |
parents | c124e2e7463e |
children | 52b5d32fbfaf 069ab3f976d3 |
comparison
equal
deleted
inserted
replaced
3959:eda6988c0d81 | 3960:f08d439fab8c |
---|---|
425 int offset = code_offset(); | 425 int offset = code_offset(); |
426 | 426 |
427 // Fetch the exception from TLS and clear out exception related thread state | 427 // Fetch the exception from TLS and clear out exception related thread state |
428 __ get_thread(rsi); | 428 __ get_thread(rsi); |
429 __ movptr(rax, Address(rsi, JavaThread::exception_oop_offset())); | 429 __ movptr(rax, Address(rsi, JavaThread::exception_oop_offset())); |
430 __ movptr(Address(rsi, JavaThread::exception_oop_offset()), (int32_t)NULL_WORD); | 430 __ movptr(Address(rsi, JavaThread::exception_oop_offset()), (intptr_t)NULL_WORD); |
431 __ movptr(Address(rsi, JavaThread::exception_pc_offset()), (int32_t)NULL_WORD); | 431 __ movptr(Address(rsi, JavaThread::exception_pc_offset()), (intptr_t)NULL_WORD); |
432 | 432 |
433 __ bind(_unwind_handler_entry); | 433 __ bind(_unwind_handler_entry); |
434 __ verify_not_null_oop(rax); | 434 __ verify_not_null_oop(rax); |
435 if (method()->is_synchronized() || compilation()->env()->dtrace_method_probes()) { | 435 if (method()->is_synchronized() || compilation()->env()->dtrace_method_probes()) { |
436 __ mov(rsi, rax); // Preserve the exception | 436 __ mov(rsi, rax); // Preserve the exception |