src/cpu/x86/vm/relocInfo_x86.cpp

changeset 5528
740e263c80c6
parent 5314
7875ea94bea5
child 6876
710a3c8b516e
child 8647
0b611970fa8b
equal deleted inserted replaced
5527:d96f52012aaa 5528:740e263c80c6
1 /* 1 /*
2 * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1998, 2013, 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.
53 } else { 53 } else {
54 *(int32_t*) disp = oopDesc::encode_heap_oop((oop)x); 54 *(int32_t*) disp = oopDesc::encode_heap_oop((oop)x);
55 } 55 }
56 } else { 56 } else {
57 if (verify_only) { 57 if (verify_only) {
58 assert(*(uint32_t*) disp == oopDesc::encode_klass((Klass*)x), "instructions must match"); 58 assert(*(uint32_t*) disp == Klass::encode_klass((Klass*)x), "instructions must match");
59 } else { 59 } else {
60 *(int32_t*) disp = oopDesc::encode_klass((Klass*)x); 60 *(int32_t*) disp = Klass::encode_klass((Klass*)x);
61 } 61 }
62 } 62 }
63 } else { 63 } else {
64 // Note: Use runtime_call_type relocations for call32_operand. 64 // Note: Use runtime_call_type relocations for call32_operand.
65 address ip = addr(); 65 address ip = addr();

mercurial