Mercurial > hg > truffle
diff src/cpu/sparc/vm/interpreter_sparc.cpp @ 7066:7d815d842ee0
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Fri, 23 Nov 2012 11:50:27 +0100 |
parents | da91efe96a93 |
children | f0c2369fda5a |
line wrap: on
line diff
--- a/src/cpu/sparc/vm/interpreter_sparc.cpp Fri Nov 23 11:40:17 2012 +0100 +++ b/src/cpu/sparc/vm/interpreter_sparc.cpp Fri Nov 23 11:50:27 2012 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,8 +30,8 @@ #include "interpreter/interpreterRuntime.hpp" #include "interpreter/templateTable.hpp" #include "oops/arrayOop.hpp" -#include "oops/methodDataOop.hpp" -#include "oops/methodOop.hpp" +#include "oops/methodData.hpp" +#include "oops/method.hpp" #include "oops/oop.inline.hpp" #include "prims/jvmtiExport.hpp" #include "prims/jvmtiThreadState.hpp" @@ -273,7 +273,7 @@ // // The entry code below assumes that the following registers are set // when coming in: -// G5_method: holds the methodOop of the method to call +// G5_method: holds the Method* of the method to call // Lesp: points to the TOS of the callers expression stack // after having pushed all the parameters //