Mercurial > hg > truffle
diff src/share/vm/c1/c1_MacroAssembler.hpp @ 1330:4a9cc99938e3
Merge
author | acorn |
---|---|
date | Fri, 26 Mar 2010 11:10:26 -0400 |
parents | 3cf667df43ef |
children | c18cbe5936b8 |
line wrap: on
line diff
--- a/src/share/vm/c1/c1_MacroAssembler.hpp Thu Mar 25 16:54:59 2010 -0700 +++ b/src/share/vm/c1/c1_MacroAssembler.hpp Fri Mar 26 11:10:26 2010 -0400 @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2000-2010 Sun Microsystems, Inc. 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 @@ -34,7 +34,7 @@ void inline_cache_check(Register receiver, Register iCache); void build_frame(int frame_size_in_bytes); - void method_exit(bool restore_frame); + void remove_frame(int frame_size_in_bytes); void unverified_entry(Register receiver, Register ic_klass); void verified_entry();