Wed, 21 May 2008 10:45:07 -0700
6695810: null oop passed to encode_heap_oop_not_null
Summary: fix several problems in C2 related to Escape Analysis and Compressed Oops.
Reviewed-by: never, jrose
duke@435 | 1 | /* |
duke@435 | 2 | * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. |
duke@435 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@435 | 4 | * |
duke@435 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@435 | 6 | * under the terms of the GNU General Public License version 2 only, as |
duke@435 | 7 | * published by the Free Software Foundation. |
duke@435 | 8 | * |
duke@435 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@435 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@435 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@435 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@435 | 13 | * accompanied this code). |
duke@435 | 14 | * |
duke@435 | 15 | * You should have received a copy of the GNU General Public License version |
duke@435 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@435 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@435 | 18 | * |
duke@435 | 19 | * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
duke@435 | 20 | * CA 95054 USA or visit www.sun.com if you need additional information or |
duke@435 | 21 | * have any questions. |
duke@435 | 22 | * |
duke@435 | 23 | */ |
duke@435 | 24 | |
duke@435 | 25 | inline void Assembler::emit_long64(jlong x) { |
duke@435 | 26 | *(jlong*) _code_pos = x; |
duke@435 | 27 | _code_pos += sizeof(jlong); |
duke@435 | 28 | code_section()->set_end(_code_pos); |
duke@435 | 29 | } |
duke@435 | 30 | |
duke@435 | 31 | inline void MacroAssembler::pd_patch_instruction(address branch, address target) { |
duke@435 | 32 | unsigned char op = branch[0]; |
duke@435 | 33 | assert(op == 0xE8 /* call */ || |
duke@435 | 34 | op == 0xE9 /* jmp */ || |
duke@435 | 35 | op == 0xEB /* short jmp */ || |
duke@435 | 36 | (op & 0xF0) == 0x70 /* short jcc */ || |
duke@435 | 37 | op == 0x0F && (branch[1] & 0xF0) == 0x80 /* jcc */, |
duke@435 | 38 | "Invalid opcode at patch point"); |
duke@435 | 39 | |
duke@435 | 40 | if (op == 0xEB || (op & 0xF0) == 0x70) { |
duke@435 | 41 | // short offset operators (jmp and jcc) |
duke@435 | 42 | char* disp = (char*) &branch[1]; |
duke@435 | 43 | int imm8 = target - (address) &disp[1]; |
duke@435 | 44 | guarantee(this->is8bit(imm8), "Short forward jump exceeds 8-bit offset"); |
duke@435 | 45 | *disp = imm8; |
duke@435 | 46 | } else { |
duke@435 | 47 | int* disp = (int*) &branch[(op == 0x0F)? 2: 1]; |
duke@435 | 48 | int imm32 = target - (address) &disp[1]; |
duke@435 | 49 | *disp = imm32; |
duke@435 | 50 | } |
duke@435 | 51 | } |
duke@435 | 52 | |
duke@435 | 53 | #ifndef PRODUCT |
duke@435 | 54 | inline void MacroAssembler::pd_print_patched_instruction(address branch) { |
duke@435 | 55 | const char* s; |
duke@435 | 56 | unsigned char op = branch[0]; |
duke@435 | 57 | if (op == 0xE8) { |
duke@435 | 58 | s = "call"; |
duke@435 | 59 | } else if (op == 0xE9 || op == 0xEB) { |
duke@435 | 60 | s = "jmp"; |
duke@435 | 61 | } else if ((op & 0xF0) == 0x70) { |
duke@435 | 62 | s = "jcc"; |
duke@435 | 63 | } else if (op == 0x0F) { |
duke@435 | 64 | s = "jcc"; |
duke@435 | 65 | } else { |
duke@435 | 66 | s = "????"; |
duke@435 | 67 | } |
duke@435 | 68 | tty->print("%s (unresolved)", s); |
duke@435 | 69 | } |
duke@435 | 70 | #endif // ndef PRODUCT |
duke@435 | 71 | |
duke@435 | 72 | inline void MacroAssembler::movptr(Address dst, intptr_t src) { |
duke@435 | 73 | #ifdef _LP64 |
duke@435 | 74 | Assembler::mov64(dst, src); |
duke@435 | 75 | #else |
duke@435 | 76 | Assembler::movl(dst, src); |
duke@435 | 77 | #endif // _LP64 |
duke@435 | 78 | } |
duke@435 | 79 | |
duke@435 | 80 | inline void MacroAssembler::movptr(Register dst, intptr_t src) { |
duke@435 | 81 | #ifdef _LP64 |
duke@435 | 82 | Assembler::mov64(dst, src); |
duke@435 | 83 | #else |
duke@435 | 84 | Assembler::movl(dst, src); |
duke@435 | 85 | #endif // _LP64 |
duke@435 | 86 | } |