Thu, 13 Jun 2013 22:02:40 -0700
8014431: cleanup warnings indicated by the -Wunused-value compiler option on linux
Reviewed-by: dholmes, coleenp
Contributed-by: jeremymanson@google.com, calvin.cheung@oracle.com
kamg@4245 | 1 | /* |
kamg@4245 | 2 | * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. |
kamg@4245 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
kamg@4245 | 4 | * |
kamg@4245 | 5 | * This code is free software; you can redistribute it and/or modify it |
kamg@4245 | 6 | * under the terms of the GNU General Public License version 2 only, as |
kamg@4245 | 7 | * published by the Free Software Foundation. |
kamg@4245 | 8 | * |
kamg@4245 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
kamg@4245 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
kamg@4245 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
kamg@4245 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
kamg@4245 | 13 | * accompanied this code). |
kamg@4245 | 14 | * |
kamg@4245 | 15 | * You should have received a copy of the GNU General Public License version |
kamg@4245 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
kamg@4245 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
kamg@4245 | 18 | * |
kamg@4245 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
kamg@4245 | 20 | * or visit www.oracle.com if you need additional information or have any |
kamg@4245 | 21 | * questions. |
kamg@4245 | 22 | * |
kamg@4245 | 23 | */ |
kamg@4245 | 24 | |
kamg@4245 | 25 | #include "precompiled.hpp" |
kamg@4245 | 26 | |
kamg@4245 | 27 | #include "classfile/bytecodeAssembler.hpp" |
kamg@4245 | 28 | #include "interpreter/bytecodes.hpp" |
kamg@4245 | 29 | #include "memory/oopFactory.hpp" |
kamg@4245 | 30 | #include "oops/constantPool.hpp" |
kamg@4245 | 31 | |
kamg@4245 | 32 | #ifdef TARGET_ARCH_x86 |
kamg@4245 | 33 | # include "bytes_x86.hpp" |
kamg@4245 | 34 | #endif |
kamg@4245 | 35 | #ifdef TARGET_ARCH_sparc |
kamg@4245 | 36 | # include "bytes_sparc.hpp" |
kamg@4245 | 37 | #endif |
kamg@4245 | 38 | #ifdef TARGET_ARCH_zero |
kamg@4245 | 39 | # include "bytes_zero.hpp" |
kamg@4245 | 40 | #endif |
kamg@4245 | 41 | #ifdef TARGET_ARCH_arm |
kamg@4245 | 42 | # include "bytes_arm.hpp" |
kamg@4245 | 43 | #endif |
kamg@4245 | 44 | #ifdef TARGET_ARCH_ppc |
kamg@4245 | 45 | # include "bytes_ppc.hpp" |
kamg@4245 | 46 | #endif |
kamg@4245 | 47 | |
kamg@4245 | 48 | u2 BytecodeConstantPool::find_or_add(BytecodeCPEntry const& bcpe) { |
kamg@4245 | 49 | u2 index; |
kamg@4245 | 50 | u2* probe = _indices.get(bcpe); |
kamg@4245 | 51 | if (probe == NULL) { |
kamg@4245 | 52 | index = _entries.length(); |
kamg@4245 | 53 | _entries.append(bcpe); |
kamg@4245 | 54 | _indices.put(bcpe, index); |
kamg@4245 | 55 | } else { |
kamg@4245 | 56 | index = *probe; |
kamg@4245 | 57 | } |
kamg@4245 | 58 | return index + _orig->length(); |
kamg@4245 | 59 | } |
kamg@4245 | 60 | |
kamg@4245 | 61 | ConstantPool* BytecodeConstantPool::create_constant_pool(TRAPS) const { |
kamg@4245 | 62 | if (_entries.length() == 0) { |
kamg@4245 | 63 | return _orig; |
kamg@4245 | 64 | } |
kamg@4245 | 65 | |
kamg@4245 | 66 | ConstantPool* cp = ConstantPool::allocate( |
kamg@4245 | 67 | _orig->pool_holder()->class_loader_data(), |
kamg@4245 | 68 | _orig->length() + _entries.length(), CHECK_NULL); |
kamg@4245 | 69 | |
kamg@4245 | 70 | cp->set_pool_holder(_orig->pool_holder()); |
kamg@4245 | 71 | _orig->copy_cp_to(1, _orig->length() - 1, cp, 1, CHECK_NULL); |
kamg@4245 | 72 | |
kamg@4245 | 73 | for (int i = 0; i < _entries.length(); ++i) { |
kamg@4245 | 74 | BytecodeCPEntry entry = _entries.at(i); |
kamg@4245 | 75 | int idx = i + _orig->length(); |
kamg@4245 | 76 | switch (entry._tag) { |
kamg@4245 | 77 | case BytecodeCPEntry::UTF8: |
acorn@5055 | 78 | entry._u.utf8->increment_refcount(); |
kamg@4245 | 79 | cp->symbol_at_put(idx, entry._u.utf8); |
kamg@4245 | 80 | break; |
kamg@4245 | 81 | case BytecodeCPEntry::KLASS: |
kamg@4245 | 82 | cp->unresolved_klass_at_put( |
kamg@4245 | 83 | idx, cp->symbol_at(entry._u.klass)); |
kamg@4245 | 84 | break; |
kamg@4245 | 85 | case BytecodeCPEntry::STRING: |
kamg@4245 | 86 | cp->unresolved_string_at_put( |
kamg@4245 | 87 | idx, cp->symbol_at(entry._u.string)); |
kamg@4245 | 88 | break; |
kamg@4245 | 89 | case BytecodeCPEntry::NAME_AND_TYPE: |
kamg@4245 | 90 | cp->name_and_type_at_put(idx, |
kamg@4245 | 91 | entry._u.name_and_type.name_index, |
kamg@4245 | 92 | entry._u.name_and_type.type_index); |
kamg@4245 | 93 | break; |
kamg@4245 | 94 | case BytecodeCPEntry::METHODREF: |
kamg@4245 | 95 | cp->method_at_put(idx, |
kamg@4245 | 96 | entry._u.methodref.class_index, |
kamg@4245 | 97 | entry._u.methodref.name_and_type_index); |
kamg@4245 | 98 | break; |
kamg@4245 | 99 | default: |
kamg@4245 | 100 | ShouldNotReachHere(); |
kamg@4245 | 101 | } |
kamg@4245 | 102 | } |
kamg@4245 | 103 | return cp; |
kamg@4245 | 104 | } |
kamg@4245 | 105 | |
kamg@4245 | 106 | void BytecodeAssembler::append(u1 imm_u1) { |
kamg@4245 | 107 | _code->append(imm_u1); |
kamg@4245 | 108 | } |
kamg@4245 | 109 | |
kamg@4245 | 110 | void BytecodeAssembler::append(u2 imm_u2) { |
kamg@4245 | 111 | _code->append(0); |
kamg@4245 | 112 | _code->append(0); |
kamg@4245 | 113 | Bytes::put_Java_u2(_code->adr_at(_code->length() - 2), imm_u2); |
kamg@4245 | 114 | } |
kamg@4245 | 115 | |
kamg@4245 | 116 | void BytecodeAssembler::append(u4 imm_u4) { |
kamg@4245 | 117 | _code->append(0); |
kamg@4245 | 118 | _code->append(0); |
kamg@4245 | 119 | _code->append(0); |
kamg@4245 | 120 | _code->append(0); |
kamg@4245 | 121 | Bytes::put_Java_u4(_code->adr_at(_code->length() - 4), imm_u4); |
kamg@4245 | 122 | } |
kamg@4245 | 123 | |
kamg@4245 | 124 | void BytecodeAssembler::xload(u4 index, u1 onebyteop, u1 twobyteop) { |
kamg@4245 | 125 | if (index < 4) { |
kamg@4245 | 126 | _code->append(onebyteop + index); |
kamg@4245 | 127 | } else { |
kamg@4245 | 128 | _code->append(twobyteop); |
kamg@4245 | 129 | _code->append((u2)index); |
kamg@4245 | 130 | } |
kamg@4245 | 131 | } |
kamg@4245 | 132 | |
kamg@4245 | 133 | void BytecodeAssembler::dup() { |
kamg@4245 | 134 | _code->append(Bytecodes::_dup); |
kamg@4245 | 135 | } |
kamg@4245 | 136 | |
kamg@4245 | 137 | void BytecodeAssembler::_new(Symbol* sym) { |
kamg@4245 | 138 | u2 cpool_index = _cp->klass(sym); |
kamg@4245 | 139 | _code->append(Bytecodes::_new); |
kamg@4245 | 140 | append(cpool_index); |
kamg@4245 | 141 | } |
kamg@4245 | 142 | |
kamg@4245 | 143 | void BytecodeAssembler::load_string(Symbol* sym) { |
kamg@4245 | 144 | u2 cpool_index = _cp->string(sym); |
kamg@4245 | 145 | if (cpool_index < 0x100) { |
kamg@4245 | 146 | ldc(cpool_index); |
kamg@4245 | 147 | } else { |
kamg@4245 | 148 | ldc_w(cpool_index); |
kamg@4245 | 149 | } |
kamg@4245 | 150 | } |
kamg@4245 | 151 | |
kamg@4245 | 152 | void BytecodeAssembler::ldc(u1 index) { |
kamg@4245 | 153 | _code->append(Bytecodes::_ldc); |
kamg@4245 | 154 | append(index); |
kamg@4245 | 155 | } |
kamg@4245 | 156 | |
kamg@4245 | 157 | void BytecodeAssembler::ldc_w(u2 index) { |
kamg@4245 | 158 | _code->append(Bytecodes::_ldc_w); |
kamg@4245 | 159 | append(index); |
kamg@4245 | 160 | } |
kamg@4245 | 161 | |
kamg@4245 | 162 | void BytecodeAssembler::athrow() { |
kamg@4245 | 163 | _code->append(Bytecodes::_athrow); |
kamg@4245 | 164 | } |
kamg@4245 | 165 | |
kamg@4245 | 166 | void BytecodeAssembler::iload(u4 index) { |
kamg@4245 | 167 | xload(index, Bytecodes::_iload_0, Bytecodes::_iload); |
kamg@4245 | 168 | } |
kamg@4245 | 169 | |
kamg@4245 | 170 | void BytecodeAssembler::lload(u4 index) { |
kamg@4245 | 171 | xload(index, Bytecodes::_lload_0, Bytecodes::_lload); |
kamg@4245 | 172 | } |
kamg@4245 | 173 | |
kamg@4245 | 174 | void BytecodeAssembler::fload(u4 index) { |
kamg@4245 | 175 | xload(index, Bytecodes::_fload_0, Bytecodes::_fload); |
kamg@4245 | 176 | } |
kamg@4245 | 177 | |
kamg@4245 | 178 | void BytecodeAssembler::dload(u4 index) { |
kamg@4245 | 179 | xload(index, Bytecodes::_dload_0, Bytecodes::_dload); |
kamg@4245 | 180 | } |
kamg@4245 | 181 | |
kamg@4245 | 182 | void BytecodeAssembler::aload(u4 index) { |
kamg@4245 | 183 | xload(index, Bytecodes::_aload_0, Bytecodes::_aload); |
kamg@4245 | 184 | } |
kamg@4245 | 185 | |
kamg@4245 | 186 | void BytecodeAssembler::load(BasicType bt, u4 index) { |
kamg@4245 | 187 | switch (bt) { |
kamg@4245 | 188 | case T_BOOLEAN: |
kamg@4245 | 189 | case T_CHAR: |
kamg@4245 | 190 | case T_BYTE: |
kamg@4245 | 191 | case T_SHORT: |
kamg@4245 | 192 | case T_INT: iload(index); break; |
kamg@4245 | 193 | case T_FLOAT: fload(index); break; |
kamg@4245 | 194 | case T_DOUBLE: dload(index); break; |
kamg@4245 | 195 | case T_LONG: lload(index); break; |
kamg@4245 | 196 | case T_OBJECT: |
kamg@4245 | 197 | case T_ARRAY: aload(index); break; |
kamg@4245 | 198 | default: |
kamg@4245 | 199 | ShouldNotReachHere(); |
kamg@4245 | 200 | } |
kamg@4245 | 201 | } |
kamg@4245 | 202 | |
kamg@4245 | 203 | void BytecodeAssembler::checkcast(Symbol* sym) { |
kamg@4245 | 204 | u2 cpool_index = _cp->klass(sym); |
kamg@4245 | 205 | _code->append(Bytecodes::_checkcast); |
kamg@4245 | 206 | append(cpool_index); |
kamg@4245 | 207 | } |
kamg@4245 | 208 | |
kamg@4245 | 209 | void BytecodeAssembler::invokespecial(Method* method) { |
kamg@4245 | 210 | invokespecial(method->klass_name(), method->name(), method->signature()); |
kamg@4245 | 211 | } |
kamg@4245 | 212 | |
kamg@4245 | 213 | void BytecodeAssembler::invokespecial(Symbol* klss, Symbol* name, Symbol* sig) { |
kamg@4245 | 214 | u2 methodref_index = _cp->methodref(klss, name, sig); |
kamg@4245 | 215 | _code->append(Bytecodes::_invokespecial); |
kamg@4245 | 216 | append(methodref_index); |
kamg@4245 | 217 | } |
kamg@4245 | 218 | |
kamg@4245 | 219 | void BytecodeAssembler::invokevirtual(Method* method) { |
kamg@4245 | 220 | invokevirtual(method->klass_name(), method->name(), method->signature()); |
kamg@4245 | 221 | } |
kamg@4245 | 222 | |
kamg@4245 | 223 | void BytecodeAssembler::invokevirtual(Symbol* klss, Symbol* name, Symbol* sig) { |
kamg@4245 | 224 | u2 methodref_index = _cp->methodref(klss, name, sig); |
kamg@4245 | 225 | _code->append(Bytecodes::_invokevirtual); |
kamg@4245 | 226 | append(methodref_index); |
kamg@4245 | 227 | } |
kamg@4245 | 228 | |
kamg@4245 | 229 | void BytecodeAssembler::ireturn() { |
kamg@4245 | 230 | _code->append(Bytecodes::_ireturn); |
kamg@4245 | 231 | } |
kamg@4245 | 232 | |
kamg@4245 | 233 | void BytecodeAssembler::lreturn() { |
kamg@4245 | 234 | _code->append(Bytecodes::_lreturn); |
kamg@4245 | 235 | } |
kamg@4245 | 236 | |
kamg@4245 | 237 | void BytecodeAssembler::freturn() { |
kamg@4245 | 238 | _code->append(Bytecodes::_freturn); |
kamg@4245 | 239 | } |
kamg@4245 | 240 | |
kamg@4245 | 241 | void BytecodeAssembler::dreturn() { |
kamg@4245 | 242 | _code->append(Bytecodes::_dreturn); |
kamg@4245 | 243 | } |
kamg@4245 | 244 | |
kamg@4245 | 245 | void BytecodeAssembler::areturn() { |
kamg@4245 | 246 | _code->append(Bytecodes::_areturn); |
kamg@4245 | 247 | } |
kamg@4245 | 248 | |
kamg@4245 | 249 | void BytecodeAssembler::_return() { |
kamg@4245 | 250 | _code->append(Bytecodes::_return); |
kamg@4245 | 251 | } |
kamg@4245 | 252 | |
kamg@4245 | 253 | void BytecodeAssembler::_return(BasicType bt) { |
kamg@4245 | 254 | switch (bt) { |
kamg@4245 | 255 | case T_BOOLEAN: |
kamg@4245 | 256 | case T_CHAR: |
kamg@4245 | 257 | case T_BYTE: |
kamg@4245 | 258 | case T_SHORT: |
kamg@4245 | 259 | case T_INT: ireturn(); break; |
kamg@4245 | 260 | case T_FLOAT: freturn(); break; |
kamg@4245 | 261 | case T_DOUBLE: dreturn(); break; |
kamg@4245 | 262 | case T_LONG: lreturn(); break; |
kamg@4245 | 263 | case T_OBJECT: |
kamg@4245 | 264 | case T_ARRAY: areturn(); break; |
kamg@4245 | 265 | case T_VOID: _return(); break; |
kamg@4245 | 266 | default: |
kamg@4245 | 267 | ShouldNotReachHere(); |
kamg@4245 | 268 | } |
kamg@4245 | 269 | } |