Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/oops/methodDataOop.hpp	Thu Mar 03 19:52:23 2011 -0500
     1.2 +++ b/src/share/vm/oops/methodDataOop.hpp	Thu Mar 03 19:53:03 2011 -0500
     1.3 @@ -228,7 +228,7 @@
     1.4      return byte_offset_of(DataLayout, _header._struct._bci);
     1.5    }
     1.6    static ByteSize cell_offset(int index) {
     1.7 -    return byte_offset_of(DataLayout, _cells[index]);
     1.8 +    return byte_offset_of(DataLayout, _cells) + in_ByteSize(index * cell_size);
     1.9    }
    1.10    // Return a value which, when or-ed as a byte into _flags, sets the flag.
    1.11    static int flag_number_to_byte_constant(int flag_number) {

     2.1 --- a/src/share/vm/runtime/os.cpp	Thu Mar 03 19:52:23 2011 -0500
     2.2 +++ b/src/share/vm/runtime/os.cpp	Thu Mar 03 19:53:03 2011 -0500
     2.3 @@ -633,10 +633,10 @@
     2.4        *q = (u_char)freeBlockPad;
     2.5      }
     2.6      if (PrintMalloc && tty != NULL)
     2.7 -      fprintf(stderr, "os::free " SIZE_FORMAT " bytes --> " PTR_FORMAT "\n", size, memblock);
     2.8 +      fprintf(stderr, "os::free " SIZE_FORMAT " bytes --> " PTR_FORMAT "\n", size, (uintptr_t)memblock);
     2.9    } else if (PrintMalloc && tty != NULL) {
    2.10      // tty->print_cr("os::free %p", memblock);
    2.11 -    fprintf(stderr, "os::free " PTR_FORMAT "\n", memblock);
    2.12 +    fprintf(stderr, "os::free " PTR_FORMAT "\n", (uintptr_t)memblock);
    2.13    }
    2.14  #endif
    2.15    ::free((char*)memblock - space_before);