comparison src/cpu/x86/vm/methodHandles_x86.hpp @ 4970:33df1aeaebbf

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents 5dbed2f542ff
children 1d7922586cf6
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
1 /* 1 /*
2 * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
222 rf->verify(); 222 rf->verify();
223 return rf; 223 return rf;
224 } 224 }
225 225
226 static void verify_clean(MacroAssembler* _masm) NOT_DEBUG_RETURN; 226 static void verify_clean(MacroAssembler* _masm) NOT_DEBUG_RETURN;
227
228 static void describe(const frame* fr, FrameValues& values, int frame_no) PRODUCT_RETURN;
227 }; 229 };
228 230
229 // Additional helper methods for MethodHandles code generation: 231 // Additional helper methods for MethodHandles code generation:
230 public: 232 public:
231 static void load_klass_from_Class(MacroAssembler* _masm, Register klass_reg); 233 static void load_klass_from_Class(MacroAssembler* _masm, Register klass_reg);