Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/interpreter/bytecodes.cpp	Fri Aug 31 16:39:35 2012 -0700
     1.2 +++ b/src/share/vm/interpreter/bytecodes.cpp	Sat Sep 01 13:25:18 2012 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -25,7 +25,7 @@
    1.11  #include "precompiled.hpp"
    1.12  #include "interpreter/bytecodes.hpp"
    1.13  #include "memory/resourceArea.hpp"
    1.14 -#include "oops/methodOop.hpp"
    1.15 +#include "oops/method.hpp"
    1.16  #ifdef TARGET_ARCH_x86
    1.17  # include "bytes_x86.hpp"
    1.18  #endif
    1.19 @@ -61,7 +61,7 @@
    1.20  u_short         Bytecodes::_flags         [(1<<BitsPerByte)*2];
    1.21  
    1.22  #ifdef ASSERT
    1.23 -bool Bytecodes::check_method(const methodOopDesc* method, address bcp) {
    1.24 +bool Bytecodes::check_method(const Method* method, address bcp) {
    1.25    return method->contains(bcp);
    1.26  }
    1.27  #endif
    1.28 @@ -89,11 +89,11 @@
    1.29    return true;
    1.30  }
    1.31  
    1.32 -Bytecodes::Code Bytecodes::code_at(methodOop method, int bci) {
    1.33 +Bytecodes::Code Bytecodes::code_at(Method* method, int bci) {
    1.34    return code_at(method, method->bcp_from(bci));
    1.35  }
    1.36  
    1.37 -Bytecodes::Code Bytecodes::non_breakpoint_code_at(const methodOopDesc* method, address bcp) {
    1.38 +Bytecodes::Code Bytecodes::non_breakpoint_code_at(const Method* method, address bcp) {
    1.39    assert(method != NULL, "must have the method for breakpoint conversion");
    1.40    assert(method->contains(bcp), "must be valid bcp in method");
    1.41    return method->orig_bytecode_at(method->bci_from(bcp));