Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/opto/output.cpp	Sat Mar 09 11:03:07 2019 +0800
     1.2 +++ b/src/share/vm/opto/output.cpp	Fri Mar 29 13:41:31 2019 +0800
     1.3 @@ -850,26 +850,24 @@
     1.4    if( !mach->is_MachCall() ) {
     1.5      mcall = NULL;
     1.6  #ifdef MIPS
     1.7 -/*
     1.8 -        2013/10/30 Jin: safepoint_pc_offset should point to tha last instruction in safePoint.
     1.9 -                In X86 and sparc, their safePoints only contain one instruction.
    1.10 -                However, we should add current_offset with the size of safePoint in MIPS.
    1.11 -          0x2d6ff22c: lw s2, 0x14(s2)
    1.12 -        last_pd->pc_offset()=308, pc_offset=304, bci=64
    1.13 -        last_pd->pc_offset()=312, pc_offset=312, bci=64
    1.14 -        /mnt/openjdk6/hotspot/src/share/vm/code/debugInfoRec.cpp, 289 , assert(last_pd->pc_offset() == pc_offset,"must be last pc")
    1.15 -
    1.16 -          ;; Safepoint:
    1.17 -        ---> pc_offset=304
    1.18 -          0x2d6ff230: lui at, 0x2b7a            ; OopMap{s2=Oop s5=Oop t4=Oop off=308}
    1.19 -                                                ;*goto
    1.20 -                                                ; - java.util.Hashtable::get@64 (line 353)
    1.21 -        ---> last_pd(308)
    1.22 -          0x2d6ff234: lw at, 0xffffc100(at)     ;*goto
    1.23 -                                                ; - java.util.Hashtable::get@64 (line 353)
    1.24 -                                                ;   {poll}
    1.25 -          0x2d6ff238: addiu s0, zero, 0x0
    1.26 -*/
    1.27 +    // safepoint_pc_offset should point to tha last instruction in safePoint.
    1.28 +    // In X86 and sparc, their safePoints only contain one instruction.
    1.29 +    // However, we should add current_offset with the size of safePoint in MIPS.
    1.30 +    // 0x2d6ff22c: lw s2, 0x14(s2)
    1.31 +    // last_pd->pc_offset()=308, pc_offset=304, bci=64
    1.32 +    // last_pd->pc_offset()=312, pc_offset=312, bci=64
    1.33 +    // src/hotspot/share/code/debugInfoRec.cpp:295, assert(last_pd->pc_offset() == pc_offset, "must be last pc")
    1.34 +    //
    1.35 +    // ;; Safepoint:
    1.36 +    // ---> pc_offset=304
    1.37 +    // 0x2d6ff230: lui at, 0x2b7a            ; OopMap{s2=Oop s5=Oop t4=Oop off=308}
    1.38 +    //                                       ;*goto
    1.39 +    //                                       ; - java.util.Hashtable::get@64 (line 353)
    1.40 +    // ---> last_pd(308)
    1.41 +    // 0x2d6ff234: lw at, 0xffffc100(at)     ;*goto
    1.42 +    //                                       ; - java.util.Hashtable::get@64 (line 353)
    1.43 +    //                                       ;   {poll}
    1.44 +    // 0x2d6ff238: addiu s0, zero, 0x0
    1.45      safepoint_pc_offset += sfn->size(_regalloc) - 4;
    1.46  #endif
    1.47      debug_info()->add_safepoint(safepoint_pc_offset, sfn->_oop_map);