comparison src/share/vm/opto/regalloc.cpp @ 14521:29ccc4cbabca

Merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 12 Mar 2014 13:30:08 +0100
parents abec000618bf
children 4ca6dc0799b6
comparison
equal deleted inserted replaced
14520:f84115370178 14521:29ccc4cbabca
1 /* 1 /*
2 * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2000, 2013, 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.
75 // Not allowed in the out-preserve area. 75 // Not allowed in the out-preserve area.
76 // In-preserve area is allowed so Intel can fetch the return pc out. 76 // In-preserve area is allowed so Intel can fetch the return pc out.
77 assert( reg < _matcher._old_SP || 77 assert( reg < _matcher._old_SP ||
78 (reg >= OptoReg::add(_matcher._old_SP,C->out_preserve_stack_slots()) && 78 (reg >= OptoReg::add(_matcher._old_SP,C->out_preserve_stack_slots()) &&
79 reg < _matcher._in_arg_limit) || 79 reg < _matcher._in_arg_limit) ||
80 reg >= OptoReg::add(_matcher._new_SP,C->out_preserve_stack_slots()), 80 reg >= OptoReg::add(_matcher._new_SP, C->out_preserve_stack_slots()) ||
81 // Allow return_addr in the out-preserve area.
82 reg == _matcher.return_addr(),
81 "register allocated in a preserve area" ); 83 "register allocated in a preserve area" );
82 return reg2offset_unchecked( reg ); 84 return reg2offset_unchecked( reg );
83 } 85 }
84 86
85 //------------------------------offset2reg------------------------------------- 87 //------------------------------offset2reg-------------------------------------