src/cpu/x86/vm/sharedRuntime_x86_32.cpp

changeset 8987
9ffa0d7ed932
parent 8877
f04097176542
child 8997
f8a45a60bc6b
     1.1 --- a/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Mon Jun 19 22:49:52 2017 +0000
     1.2 +++ b/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Mon Jun 26 02:04:40 2017 -0700
     1.3 @@ -1333,7 +1333,7 @@
     1.4    __ increment(rsp, wordSize);
     1.5  
     1.6    __ get_thread(thread);
     1.7 -  __ reset_last_Java_frame(thread, false, true);
     1.8 +  __ reset_last_Java_frame(thread, false);
     1.9  
    1.10    save_or_restore_arguments(masm, stack_slots, total_in_args,
    1.11                              arg_save_area, NULL, in_regs, in_sig_bt);
    1.12 @@ -2251,7 +2251,7 @@
    1.13  
    1.14    // We can finally stop using that last_Java_frame we setup ages ago
    1.15  
    1.16 -  __ reset_last_Java_frame(thread, false, true);
    1.17 +  __ reset_last_Java_frame(thread, false);
    1.18  
    1.19    // Unpack oop result
    1.20    if (ret_type == T_OBJECT || ret_type == T_ARRAY) {
    1.21 @@ -2951,7 +2951,7 @@
    1.22    __ pop(rcx);
    1.23  
    1.24    __ get_thread(rcx);
    1.25 -  __ reset_last_Java_frame(rcx, false, false);
    1.26 +  __ reset_last_Java_frame(rcx, false);
    1.27  
    1.28    // Load UnrollBlock into EDI
    1.29    __ mov(rdi, rax);
    1.30 @@ -3117,7 +3117,7 @@
    1.31    __ push(rax);
    1.32  
    1.33    __ get_thread(rcx);
    1.34 -  __ reset_last_Java_frame(rcx, false, false);
    1.35 +  __ reset_last_Java_frame(rcx, false);
    1.36  
    1.37    // Collect return values
    1.38    __ movptr(rax,Address(rsp, (RegisterSaver::raxOffset() + additional_words + 1)*wordSize));
    1.39 @@ -3219,7 +3219,7 @@
    1.40  
    1.41    __ get_thread(rcx);
    1.42  
    1.43 -  __ reset_last_Java_frame(rcx, false, false);
    1.44 +  __ reset_last_Java_frame(rcx, false);
    1.45  
    1.46    // Load UnrollBlock into EDI
    1.47    __ movptr(rdi, rax);
    1.48 @@ -3331,7 +3331,7 @@
    1.49    oop_maps->add_gc_map( __ pc()-start, new OopMap( framesize, 0 ) );
    1.50  
    1.51    __ get_thread(rdi);
    1.52 -  __ reset_last_Java_frame(rdi, true, false);
    1.53 +  __ reset_last_Java_frame(rdi, true);
    1.54  
    1.55    // Pop self-frame.
    1.56    __ leave();     // Epilog!
    1.57 @@ -3426,7 +3426,7 @@
    1.58  
    1.59    // Clear last_Java_sp again
    1.60    __ get_thread(java_thread);
    1.61 -  __ reset_last_Java_frame(java_thread, false, false);
    1.62 +  __ reset_last_Java_frame(java_thread, false);
    1.63  
    1.64    __ cmpptr(Address(java_thread, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
    1.65    __ jcc(Assembler::equal, noException);
    1.66 @@ -3501,7 +3501,7 @@
    1.67    __ addptr(rsp, wordSize);
    1.68  
    1.69    // clear last_Java_sp
    1.70 -  __ reset_last_Java_frame(thread, true, false);
    1.71 +  __ reset_last_Java_frame(thread, true);
    1.72    // check for pending exceptions
    1.73    Label pending;
    1.74    __ cmpptr(Address(thread, Thread::pending_exception_offset()), (int32_t)NULL_WORD);

mercurial