Thu, 07 Sep 2017 09:12:16 +0800
#5745 [Code Reorganization] code cleanup and code style fix
This is a huge patch, but only code cleanup, code style fix and useless code deletion are included, for example:
tab -> two spaces, deleted spacees at the end of a line, delete useless comments.
This patch also included:
Declaration and definition of class MacroAssembler is moved from assembler_mips.h/cpp to macroAssembler_mips.h/cpp
aoqi@1 | 1 | /* |
aoqi@1 | 2 | * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. |
aoqi@1 | 3 | * Copyright (c) 2015, 2016, Loongson Technology. All rights reserved. |
aoqi@1 | 4 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
aoqi@1 | 5 | * |
aoqi@1 | 6 | * This code is free software; you can redistribute it and/or modify it |
aoqi@1 | 7 | * under the terms of the GNU General Public License version 2 only, as |
aoqi@1 | 8 | * published by the Free Software Foundation. |
aoqi@1 | 9 | * |
aoqi@1 | 10 | * This code is distributed in the hope that it will be useful, but WITHOUT |
aoqi@1 | 11 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
aoqi@1 | 12 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
aoqi@1 | 13 | * version 2 for more details (a copy is included in the LICENSE file that |
aoqi@1 | 14 | * accompanied this code). |
aoqi@1 | 15 | * |
aoqi@1 | 16 | * You should have received a copy of the GNU General Public License version |
aoqi@1 | 17 | * 2 along with this work; if not, write to the Free Software Foundation, |
aoqi@1 | 18 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
aoqi@1 | 19 | * |
aoqi@1 | 20 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
aoqi@1 | 21 | * or visit www.oracle.com if you need additional information or have any |
aoqi@1 | 22 | * questions. |
aoqi@1 | 23 | * |
aoqi@1 | 24 | */ |
aoqi@1 | 25 | |
aoqi@1 | 26 | #ifndef CPU_MIPS_VM_BYTECODEINTERPRETER_MIPS_INLINE_HPP |
aoqi@1 | 27 | #define CPU_MIPS_VM_BYTECODEINTERPRETER_MIPS_INLINE_HPP |
aoqi@1 | 28 | |
aoqi@1 | 29 | // Inline interpreter functions for IA32 |
aoqi@1 | 30 | |
aoqi@1 | 31 | inline jfloat BytecodeInterpreter::VMfloatAdd(jfloat op1, jfloat op2) { return op1 + op2; } |
aoqi@1 | 32 | inline jfloat BytecodeInterpreter::VMfloatSub(jfloat op1, jfloat op2) { return op1 - op2; } |
aoqi@1 | 33 | inline jfloat BytecodeInterpreter::VMfloatMul(jfloat op1, jfloat op2) { return op1 * op2; } |
aoqi@1 | 34 | inline jfloat BytecodeInterpreter::VMfloatDiv(jfloat op1, jfloat op2) { return op1 / op2; } |
aoqi@1 | 35 | inline jfloat BytecodeInterpreter::VMfloatRem(jfloat op1, jfloat op2) { return fmod(op1, op2); } |
aoqi@1 | 36 | |
aoqi@1 | 37 | inline jfloat BytecodeInterpreter::VMfloatNeg(jfloat op) { return -op; } |
aoqi@1 | 38 | |
aoqi@1 | 39 | inline int32_t BytecodeInterpreter::VMfloatCompare(jfloat op1, jfloat op2, int32_t direction) { |
aoqi@1 | 40 | return ( op1 < op2 ? -1 : |
aoqi@1 | 41 | op1 > op2 ? 1 : |
aoqi@1 | 42 | op1 == op2 ? 0 : |
aoqi@1 | 43 | (direction == -1 || direction == 1) ? direction : 0); |
aoqi@1 | 44 | |
aoqi@1 | 45 | } |
aoqi@1 | 46 | |
aoqi@1 | 47 | inline void BytecodeInterpreter::VMmemCopy64(uint32_t to[2], const uint32_t from[2]) { |
aoqi@1 | 48 | // x86 can do unaligned copies but not 64bits at a time |
aoqi@1 | 49 | to[0] = from[0]; to[1] = from[1]; |
aoqi@1 | 50 | } |
aoqi@1 | 51 | |
aoqi@1 | 52 | // The long operations depend on compiler support for "long long" on x86 |
aoqi@1 | 53 | |
aoqi@1 | 54 | inline jlong BytecodeInterpreter::VMlongAdd(jlong op1, jlong op2) { |
aoqi@1 | 55 | return op1 + op2; |
aoqi@1 | 56 | } |
aoqi@1 | 57 | |
aoqi@1 | 58 | inline jlong BytecodeInterpreter::VMlongAnd(jlong op1, jlong op2) { |
aoqi@1 | 59 | return op1 & op2; |
aoqi@1 | 60 | } |
aoqi@1 | 61 | |
aoqi@1 | 62 | inline jlong BytecodeInterpreter::VMlongDiv(jlong op1, jlong op2) { |
aoqi@1 | 63 | // QQQ what about check and throw... |
aoqi@1 | 64 | return op1 / op2; |
aoqi@1 | 65 | } |
aoqi@1 | 66 | |
aoqi@1 | 67 | inline jlong BytecodeInterpreter::VMlongMul(jlong op1, jlong op2) { |
aoqi@1 | 68 | return op1 * op2; |
aoqi@1 | 69 | } |
aoqi@1 | 70 | |
aoqi@1 | 71 | inline jlong BytecodeInterpreter::VMlongOr(jlong op1, jlong op2) { |
aoqi@1 | 72 | return op1 | op2; |
aoqi@1 | 73 | } |
aoqi@1 | 74 | |
aoqi@1 | 75 | inline jlong BytecodeInterpreter::VMlongSub(jlong op1, jlong op2) { |
aoqi@1 | 76 | return op1 - op2; |
aoqi@1 | 77 | } |
aoqi@1 | 78 | |
aoqi@1 | 79 | inline jlong BytecodeInterpreter::VMlongXor(jlong op1, jlong op2) { |
aoqi@1 | 80 | return op1 ^ op2; |
aoqi@1 | 81 | } |
aoqi@1 | 82 | |
aoqi@1 | 83 | inline jlong BytecodeInterpreter::VMlongRem(jlong op1, jlong op2) { |
aoqi@1 | 84 | return op1 % op2; |
aoqi@1 | 85 | } |
aoqi@1 | 86 | |
aoqi@1 | 87 | inline jlong BytecodeInterpreter::VMlongUshr(jlong op1, jint op2) { |
aoqi@1 | 88 | // CVM did this 0x3f mask, is the really needed??? QQQ |
aoqi@1 | 89 | return ((unsigned long long) op1) >> (op2 & 0x3F); |
aoqi@1 | 90 | } |
aoqi@1 | 91 | |
aoqi@1 | 92 | inline jlong BytecodeInterpreter::VMlongShr(jlong op1, jint op2) { |
aoqi@1 | 93 | return op1 >> (op2 & 0x3F); |
aoqi@1 | 94 | } |
aoqi@1 | 95 | |
aoqi@1 | 96 | inline jlong BytecodeInterpreter::VMlongShl(jlong op1, jint op2) { |
aoqi@1 | 97 | return op1 << (op2 & 0x3F); |
aoqi@1 | 98 | } |
aoqi@1 | 99 | |
aoqi@1 | 100 | inline jlong BytecodeInterpreter::VMlongNeg(jlong op) { |
aoqi@1 | 101 | return -op; |
aoqi@1 | 102 | } |
aoqi@1 | 103 | |
aoqi@1 | 104 | inline jlong BytecodeInterpreter::VMlongNot(jlong op) { |
aoqi@1 | 105 | return ~op; |
aoqi@1 | 106 | } |
aoqi@1 | 107 | |
aoqi@1 | 108 | inline int32_t BytecodeInterpreter::VMlongLtz(jlong op) { |
aoqi@1 | 109 | return (op <= 0); |
aoqi@1 | 110 | } |
aoqi@1 | 111 | |
aoqi@1 | 112 | inline int32_t BytecodeInterpreter::VMlongGez(jlong op) { |
aoqi@1 | 113 | return (op >= 0); |
aoqi@1 | 114 | } |
aoqi@1 | 115 | |
aoqi@1 | 116 | inline int32_t BytecodeInterpreter::VMlongEqz(jlong op) { |
aoqi@1 | 117 | return (op == 0); |
aoqi@1 | 118 | } |
aoqi@1 | 119 | |
aoqi@1 | 120 | inline int32_t BytecodeInterpreter::VMlongEq(jlong op1, jlong op2) { |
aoqi@1 | 121 | return (op1 == op2); |
aoqi@1 | 122 | } |
aoqi@1 | 123 | |
aoqi@1 | 124 | inline int32_t BytecodeInterpreter::VMlongNe(jlong op1, jlong op2) { |
aoqi@1 | 125 | return (op1 != op2); |
aoqi@1 | 126 | } |
aoqi@1 | 127 | |
aoqi@1 | 128 | inline int32_t BytecodeInterpreter::VMlongGe(jlong op1, jlong op2) { |
aoqi@1 | 129 | return (op1 >= op2); |
aoqi@1 | 130 | } |
aoqi@1 | 131 | |
aoqi@1 | 132 | inline int32_t BytecodeInterpreter::VMlongLe(jlong op1, jlong op2) { |
aoqi@1 | 133 | return (op1 <= op2); |
aoqi@1 | 134 | } |
aoqi@1 | 135 | |
aoqi@1 | 136 | inline int32_t BytecodeInterpreter::VMlongLt(jlong op1, jlong op2) { |
aoqi@1 | 137 | return (op1 < op2); |
aoqi@1 | 138 | } |
aoqi@1 | 139 | |
aoqi@1 | 140 | inline int32_t BytecodeInterpreter::VMlongGt(jlong op1, jlong op2) { |
aoqi@1 | 141 | return (op1 > op2); |
aoqi@1 | 142 | } |
aoqi@1 | 143 | |
aoqi@1 | 144 | inline int32_t BytecodeInterpreter::VMlongCompare(jlong op1, jlong op2) { |
aoqi@1 | 145 | return (VMlongLt(op1, op2) ? -1 : VMlongGt(op1, op2) ? 1 : 0); |
aoqi@1 | 146 | } |
aoqi@1 | 147 | |
aoqi@1 | 148 | // Long conversions |
aoqi@1 | 149 | |
aoqi@1 | 150 | inline jdouble BytecodeInterpreter::VMlong2Double(jlong val) { |
aoqi@1 | 151 | return (jdouble) val; |
aoqi@1 | 152 | } |
aoqi@1 | 153 | |
aoqi@1 | 154 | inline jfloat BytecodeInterpreter::VMlong2Float(jlong val) { |
aoqi@1 | 155 | return (jfloat) val; |
aoqi@1 | 156 | } |
aoqi@1 | 157 | |
aoqi@1 | 158 | inline jint BytecodeInterpreter::VMlong2Int(jlong val) { |
aoqi@1 | 159 | return (jint) val; |
aoqi@1 | 160 | } |
aoqi@1 | 161 | |
aoqi@1 | 162 | // Double Arithmetic |
aoqi@1 | 163 | |
aoqi@1 | 164 | inline jdouble BytecodeInterpreter::VMdoubleAdd(jdouble op1, jdouble op2) { |
aoqi@1 | 165 | return op1 + op2; |
aoqi@1 | 166 | } |
aoqi@1 | 167 | |
aoqi@1 | 168 | inline jdouble BytecodeInterpreter::VMdoubleDiv(jdouble op1, jdouble op2) { |
aoqi@1 | 169 | // Divide by zero... QQQ |
aoqi@1 | 170 | return op1 / op2; |
aoqi@1 | 171 | } |
aoqi@1 | 172 | |
aoqi@1 | 173 | inline jdouble BytecodeInterpreter::VMdoubleMul(jdouble op1, jdouble op2) { |
aoqi@1 | 174 | return op1 * op2; |
aoqi@1 | 175 | } |
aoqi@1 | 176 | |
aoqi@1 | 177 | inline jdouble BytecodeInterpreter::VMdoubleNeg(jdouble op) { |
aoqi@1 | 178 | return -op; |
aoqi@1 | 179 | } |
aoqi@1 | 180 | |
aoqi@1 | 181 | inline jdouble BytecodeInterpreter::VMdoubleRem(jdouble op1, jdouble op2) { |
aoqi@1 | 182 | return fmod(op1, op2); |
aoqi@1 | 183 | } |
aoqi@1 | 184 | |
aoqi@1 | 185 | inline jdouble BytecodeInterpreter::VMdoubleSub(jdouble op1, jdouble op2) { |
aoqi@1 | 186 | return op1 - op2; |
aoqi@1 | 187 | } |
aoqi@1 | 188 | |
aoqi@1 | 189 | inline int32_t BytecodeInterpreter::VMdoubleCompare(jdouble op1, jdouble op2, int32_t direction) { |
aoqi@1 | 190 | return ( op1 < op2 ? -1 : |
aoqi@1 | 191 | op1 > op2 ? 1 : |
aoqi@1 | 192 | op1 == op2 ? 0 : |
aoqi@1 | 193 | (direction == -1 || direction == 1) ? direction : 0); |
aoqi@1 | 194 | } |
aoqi@1 | 195 | |
aoqi@1 | 196 | // Double Conversions |
aoqi@1 | 197 | |
aoqi@1 | 198 | inline jfloat BytecodeInterpreter::VMdouble2Float(jdouble val) { |
aoqi@1 | 199 | return (jfloat) val; |
aoqi@1 | 200 | } |
aoqi@1 | 201 | |
aoqi@1 | 202 | // Float Conversions |
aoqi@1 | 203 | |
aoqi@1 | 204 | inline jdouble BytecodeInterpreter::VMfloat2Double(jfloat op) { |
aoqi@1 | 205 | return (jdouble) op; |
aoqi@1 | 206 | } |
aoqi@1 | 207 | |
aoqi@1 | 208 | // Integer Arithmetic |
aoqi@1 | 209 | |
aoqi@1 | 210 | inline jint BytecodeInterpreter::VMintAdd(jint op1, jint op2) { |
aoqi@1 | 211 | return op1 + op2; |
aoqi@1 | 212 | } |
aoqi@1 | 213 | |
aoqi@1 | 214 | inline jint BytecodeInterpreter::VMintAnd(jint op1, jint op2) { |
aoqi@1 | 215 | return op1 & op2; |
aoqi@1 | 216 | } |
aoqi@1 | 217 | |
aoqi@1 | 218 | inline jint BytecodeInterpreter::VMintDiv(jint op1, jint op2) { |
aoqi@1 | 219 | /* it's possible we could catch this special case implicitly */ |
aoqi@1 | 220 | if ((juint)op1 == 0x80000000 && op2 == -1) return op1; |
aoqi@1 | 221 | else return op1 / op2; |
aoqi@1 | 222 | } |
aoqi@1 | 223 | |
aoqi@1 | 224 | inline jint BytecodeInterpreter::VMintMul(jint op1, jint op2) { |
aoqi@1 | 225 | return op1 * op2; |
aoqi@1 | 226 | } |
aoqi@1 | 227 | |
aoqi@1 | 228 | inline jint BytecodeInterpreter::VMintNeg(jint op) { |
aoqi@1 | 229 | return -op; |
aoqi@1 | 230 | } |
aoqi@1 | 231 | |
aoqi@1 | 232 | inline jint BytecodeInterpreter::VMintOr(jint op1, jint op2) { |
aoqi@1 | 233 | return op1 | op2; |
aoqi@1 | 234 | } |
aoqi@1 | 235 | |
aoqi@1 | 236 | inline jint BytecodeInterpreter::VMintRem(jint op1, jint op2) { |
aoqi@1 | 237 | /* it's possible we could catch this special case implicitly */ |
aoqi@1 | 238 | if ((juint)op1 == 0x80000000 && op2 == -1) return 0; |
aoqi@1 | 239 | else return op1 % op2; |
aoqi@1 | 240 | } |
aoqi@1 | 241 | |
aoqi@1 | 242 | inline jint BytecodeInterpreter::VMintShl(jint op1, jint op2) { |
aoqi@1 | 243 | return op1 << op2; |
aoqi@1 | 244 | } |
aoqi@1 | 245 | |
aoqi@1 | 246 | inline jint BytecodeInterpreter::VMintShr(jint op1, jint op2) { |
aoqi@1 | 247 | return op1 >> (op2 & 0x1f); // QQ op2 & 0x1f?? |
aoqi@1 | 248 | } |
aoqi@1 | 249 | |
aoqi@1 | 250 | inline jint BytecodeInterpreter::VMintSub(jint op1, jint op2) { |
aoqi@1 | 251 | return op1 - op2; |
aoqi@1 | 252 | } |
aoqi@1 | 253 | |
aoqi@1 | 254 | inline jint BytecodeInterpreter::VMintUshr(jint op1, jint op2) { |
aoqi@1 | 255 | return ((juint) op1) >> (op2 & 0x1f); // QQ op2 & 0x1f?? |
aoqi@1 | 256 | } |
aoqi@1 | 257 | |
aoqi@1 | 258 | inline jint BytecodeInterpreter::VMintXor(jint op1, jint op2) { |
aoqi@1 | 259 | return op1 ^ op2; |
aoqi@1 | 260 | } |
aoqi@1 | 261 | |
aoqi@1 | 262 | inline jdouble BytecodeInterpreter::VMint2Double(jint val) { |
aoqi@1 | 263 | return (jdouble) val; |
aoqi@1 | 264 | } |
aoqi@1 | 265 | |
aoqi@1 | 266 | inline jfloat BytecodeInterpreter::VMint2Float(jint val) { |
aoqi@1 | 267 | return (jfloat) val; |
aoqi@1 | 268 | } |
aoqi@1 | 269 | |
aoqi@1 | 270 | inline jlong BytecodeInterpreter::VMint2Long(jint val) { |
aoqi@1 | 271 | return (jlong) val; |
aoqi@1 | 272 | } |
aoqi@1 | 273 | |
aoqi@1 | 274 | inline jchar BytecodeInterpreter::VMint2Char(jint val) { |
aoqi@1 | 275 | return (jchar) val; |
aoqi@1 | 276 | } |
aoqi@1 | 277 | |
aoqi@1 | 278 | inline jshort BytecodeInterpreter::VMint2Short(jint val) { |
aoqi@1 | 279 | return (jshort) val; |
aoqi@1 | 280 | } |
aoqi@1 | 281 | |
aoqi@1 | 282 | inline jbyte BytecodeInterpreter::VMint2Byte(jint val) { |
aoqi@1 | 283 | return (jbyte) val; |
aoqi@1 | 284 | } |
aoqi@1 | 285 | |
aoqi@1 | 286 | #endif // CPU_MIPS_VM_BYTECODEINTERPRETER_MIPS_INLINE_HPP |