1.1 --- a/src/cpu/mips/vm/stubGenerator_mips_64.cpp Thu Nov 16 17:27:00 2017 +0800
1.2 +++ b/src/cpu/mips/vm/stubGenerator_mips_64.cpp Mon Nov 13 15:49:42 2017 +0800
1.3 @@ -392,11 +392,11 @@
1.4 // ignore them. A potential result in registers can be ignored as
1.5 // well.
1.6
1.7 -#ifdef ASSERT
1.8 - // make sure this code is only executed if there is a pending exception
1.9 #ifndef OPT_THREAD
1.10 __ get_thread(thread);
1.11 #endif
1.12 +#ifdef ASSERT
1.13 + // make sure this code is only executed if there is a pending exception
1.14 {
1.15 Label L;
1.16 __ ld(AT, thread, in_bytes(Thread::pending_exception_offset()));
1.17 @@ -612,7 +612,7 @@
1.18 // exactly backwards!!
1.19 //__ xchgptr(c_rarg1, c_rarg0);
1.20 __ move(AT, A0);
1.21 - __ move(A0, A1);
1.22 + __ move(A0, A1);
1.23 __ move(A1, AT);
1.24 } else {
1.25 __ move(A1, count);
1.26 @@ -659,7 +659,7 @@
1.27 // exactly backwards!!
1.28 //__ xchgptr(c_rarg1, c_rarg0);
1.29 __ move(AT, A0);
1.30 - __ move(A0, A1);
1.31 + __ move(A0, A1);
1.32 __ move(A1, AT);
1.33 } else {
1.34 __ move(A1, count);
1.35 @@ -694,7 +694,7 @@
1.36 __ dsubu(end, end, start); // end --> cards count
1.37
1.38 __ daddu(start, start, scratch);
1.39 -
1.40 +
1.41 __ bind(L_loop);
1.42 if (UseLoongsonISA) {
1.43 __ gssbx(R0, start, count, 0);
1.44 @@ -1993,14 +1993,14 @@
1.45 int frame_complete = __ pc() - start;
1.46 // push java thread (becomes first argument of C function)
1.47 __ sd(java_thread, SP, thread_off * wordSize);
1.48 - if (java_thread!=A0)
1.49 + if (java_thread != A0)
1.50 __ move(A0, java_thread);
1.51
1.52 // Set up last_Java_sp and last_Java_fp
1.53 __ set_last_Java_frame(java_thread, SP, FP, NULL);
1.54 - // Align stack
1.55 - __ set64(AT, -(StackAlignmentInBytes));
1.56 - __ andr(SP, SP, AT);
1.57 + // Align stack
1.58 + __ set64(AT, -(StackAlignmentInBytes));
1.59 + __ andr(SP, SP, AT);
1.60
1.61 __ relocate(relocInfo::internal_pc_type);
1.62 {
1.63 @@ -2051,8 +2051,11 @@
1.64 #endif //ASSERT
1.65 __ jmp(StubRoutines::forward_exception_entry(), relocInfo::runtime_call_type);
1.66 __ delayed()->nop();
1.67 - RuntimeStub* stub = RuntimeStub::new_runtime_stub(name, &code,frame_complete,
1.68 - framesize, oop_maps, false);
1.69 + RuntimeStub* stub = RuntimeStub::new_runtime_stub(name,
1.70 + &code,
1.71 + frame_complete,
1.72 + framesize,
1.73 + oop_maps, false);
1.74 return stub->entry_point();
1.75 }
1.76
