Wed, 24 Dec 2008 13:06:09 -0800
6787106: Hotspot 32 bit build fails on platforms having different definitions for intptr_t & int32_t
Summary: Avoid casting between int32_t and intptr_t specifically for MasmAssembler::movptr in 32 bit platforms.
Reviewed-by: jrose, kvn
duke@435 | 1 | /* |
xdono@772 | 2 | * Copyright 1997-2008 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 MacroAssembler::pd_patch_instruction(address branch, address target) { |
duke@435 | 26 | unsigned char op = branch[0]; |
duke@435 | 27 | assert(op == 0xE8 /* call */ || |
duke@435 | 28 | op == 0xE9 /* jmp */ || |
duke@435 | 29 | op == 0xEB /* short jmp */ || |
duke@435 | 30 | (op & 0xF0) == 0x70 /* short jcc */ || |
duke@435 | 31 | op == 0x0F && (branch[1] & 0xF0) == 0x80 /* jcc */, |
duke@435 | 32 | "Invalid opcode at patch point"); |
duke@435 | 33 | |
duke@435 | 34 | if (op == 0xEB || (op & 0xF0) == 0x70) { |
duke@435 | 35 | // short offset operators (jmp and jcc) |
duke@435 | 36 | char* disp = (char*) &branch[1]; |
duke@435 | 37 | int imm8 = target - (address) &disp[1]; |
duke@435 | 38 | guarantee(this->is8bit(imm8), "Short forward jump exceeds 8-bit offset"); |
duke@435 | 39 | *disp = imm8; |
duke@435 | 40 | } else { |
duke@435 | 41 | int* disp = (int*) &branch[(op == 0x0F)? 2: 1]; |
duke@435 | 42 | int imm32 = target - (address) &disp[1]; |
duke@435 | 43 | *disp = imm32; |
duke@435 | 44 | } |
duke@435 | 45 | } |
duke@435 | 46 | |
duke@435 | 47 | #ifndef PRODUCT |
duke@435 | 48 | inline void MacroAssembler::pd_print_patched_instruction(address branch) { |
duke@435 | 49 | const char* s; |
duke@435 | 50 | unsigned char op = branch[0]; |
duke@435 | 51 | if (op == 0xE8) { |
duke@435 | 52 | s = "call"; |
duke@435 | 53 | } else if (op == 0xE9 || op == 0xEB) { |
duke@435 | 54 | s = "jmp"; |
duke@435 | 55 | } else if ((op & 0xF0) == 0x70) { |
duke@435 | 56 | s = "jcc"; |
duke@435 | 57 | } else if (op == 0x0F) { |
duke@435 | 58 | s = "jcc"; |
duke@435 | 59 | } else { |
duke@435 | 60 | s = "????"; |
duke@435 | 61 | } |
duke@435 | 62 | tty->print("%s (unresolved)", s); |
duke@435 | 63 | } |
duke@435 | 64 | #endif // ndef PRODUCT |
never@739 | 65 | |
never@739 | 66 | #ifndef _LP64 |
never@739 | 67 | inline int Assembler::prefix_and_encode(int reg_enc, bool byteinst) { return reg_enc; } |
never@739 | 68 | inline int Assembler::prefixq_and_encode(int reg_enc) { return reg_enc; } |
never@739 | 69 | |
never@739 | 70 | inline int Assembler::prefix_and_encode(int dst_enc, int src_enc, bool byteinst) { return dst_enc << 3 | src_enc; } |
never@739 | 71 | inline int Assembler::prefixq_and_encode(int dst_enc, int src_enc) { return dst_enc << 3 | src_enc; } |
never@739 | 72 | |
never@739 | 73 | inline void Assembler::prefix(Register reg) {} |
never@739 | 74 | inline void Assembler::prefix(Address adr) {} |
never@739 | 75 | inline void Assembler::prefixq(Address adr) {} |
never@739 | 76 | |
never@739 | 77 | inline void Assembler::prefix(Address adr, Register reg, bool byteinst) {} |
never@739 | 78 | inline void Assembler::prefixq(Address adr, Register reg) {} |
never@739 | 79 | |
never@739 | 80 | inline void Assembler::prefix(Address adr, XMMRegister reg) {} |
never@739 | 81 | #else |
never@739 | 82 | inline void Assembler::emit_long64(jlong x) { |
never@739 | 83 | *(jlong*) _code_pos = x; |
never@739 | 84 | _code_pos += sizeof(jlong); |
never@739 | 85 | code_section()->set_end(_code_pos); |
never@739 | 86 | } |
never@739 | 87 | #endif // _LP64 |