comparison src/cpu/x86/vm/relocInfo_x86.cpp @ 6725:da91efe96a93

6964458: Reimplement class meta-data storage to use native memory Summary: Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland Contributed-by: jmasa <jon.masamitsu@oracle.com>, stefank <stefan.karlsson@oracle.com>, mgerdin <mikael.gerdin@oracle.com>, never <tom.rodriguez@oracle.com>
author coleenp
date Sat, 01 Sep 2012 13:25:18 -0400
parents b40d4fa697bf
children cd3d6a6b95d9
comparison
equal deleted inserted replaced
6724:36d1d483d5d6 6725:da91efe96a93
1 /* 1 /*
2 * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1998, 2012, 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.
45 } else { 45 } else {
46 *pd_address_in_code() = x; 46 *pd_address_in_code() = x;
47 } 47 }
48 } else if (which == Assembler::narrow_oop_operand) { 48 } else if (which == Assembler::narrow_oop_operand) {
49 address disp = Assembler::locate_operand(addr(), which); 49 address disp = Assembler::locate_operand(addr(), which);
50 // both compressed oops and compressed classes look the same
51 if (Universe::heap()->is_in_reserved((oop)x)) {
50 if (verify_only) { 52 if (verify_only) {
51 assert(*(uint32_t*) disp == oopDesc::encode_heap_oop((oop)x), "instructions must match"); 53 assert(*(uint32_t*) disp == oopDesc::encode_heap_oop((oop)x), "instructions must match");
52 } else { 54 } else {
53 *(int32_t*) disp = oopDesc::encode_heap_oop((oop)x); 55 *(int32_t*) disp = oopDesc::encode_heap_oop((oop)x);
56 }
57 } else {
58 if (verify_only) {
59 assert(*(uint32_t*) disp == oopDesc::encode_klass((Klass*)x), "instructions must match");
60 } else {
61 *(int32_t*) disp = oopDesc::encode_klass((Klass*)x);
62 }
54 } 63 }
55 } else { 64 } else {
56 // Note: Use runtime_call_type relocations for call32_operand. 65 // Note: Use runtime_call_type relocations for call32_operand.
57 address ip = addr(); 66 address ip = addr();
58 address disp = Assembler::locate_operand(ip, which); 67 address disp = Assembler::locate_operand(ip, which);
237 int32_t* disp = (int32_t*) Assembler::locate_operand(addr(), which); 246 int32_t* disp = (int32_t*) Assembler::locate_operand(addr(), which);
238 * disp = (int32_t)new_disp; 247 * disp = (int32_t)new_disp;
239 } 248 }
240 #endif // _LP64 249 #endif // _LP64
241 } 250 }
251
252 void metadata_Relocation::pd_fix_value(address x) {
253 }