1.1 --- a/src/cpu/zero/vm/entry_zero.hpp Fri Aug 31 16:39:35 2012 -0700 1.2 +++ b/src/cpu/zero/vm/entry_zero.hpp Sat Sep 01 13:25:18 2012 -0400 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. 1.7 * Copyright 2008, 2009, 2010 Red Hat, Inc. 1.8 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.9 * 1.10 @@ -44,21 +44,21 @@ 1.11 } 1.12 1.13 private: 1.14 - typedef int (*NormalEntryFunc)(methodOop method, 1.15 + typedef int (*NormalEntryFunc)(Method* method, 1.16 intptr_t base_pc, 1.17 TRAPS); 1.18 - typedef int (*OSREntryFunc)(methodOop method, 1.19 + typedef int (*OSREntryFunc)(Method* method, 1.20 address osr_buf, 1.21 intptr_t base_pc, 1.22 TRAPS); 1.23 1.24 public: 1.25 - void invoke(methodOop method, TRAPS) const { 1.26 + void invoke(Method* method, TRAPS) const { 1.27 maybe_deoptimize( 1.28 ((NormalEntryFunc) entry_point())(method, (intptr_t) this, THREAD), 1.29 THREAD); 1.30 } 1.31 - void invoke_osr(methodOop method, address osr_buf, TRAPS) const { 1.32 + void invoke_osr(Method* method, address osr_buf, TRAPS) const { 1.33 maybe_deoptimize( 1.34 ((OSREntryFunc) entry_point())(method, osr_buf, (intptr_t) this, THREAD), 1.35 THREAD);