Mercurial > jdk8-mips64-public > hotspot / file comparison
comparison: src/cpu/sparc/vm/nativeInst_sparc.cpp
src/cpu/sparc/vm/nativeInst_sparc.cpp
- changeset 5784
- 190899198332
- parent 5283
- 46c544b8fbfc
- child 6876
- 710a3c8b516e
- child 8647
- 0b611970fa8b
equal
deleted
inserted
replaced
| 5783:c1fbf21c7397 | 5784:190899198332 |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1997, 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. |
| 356 while (iter.next()) { | 356 while (iter.next()) { |
| 357 if (iter.type() == relocInfo::oop_type) { | 357 if (iter.type() == relocInfo::oop_type) { |
| 358 oop_Relocation *r = iter.oop_reloc(); | 358 oop_Relocation *r = iter.oop_reloc(); |
| 359 if (oop_addr == NULL) { | 359 if (oop_addr == NULL) { |
| 360 oop_addr = r->oop_addr(); | 360 oop_addr = r->oop_addr(); |
| 361 *oop_addr = (oop)x; | 361 *oop_addr = cast_to_oop(x); |
| 362 } else { | 362 } else { |
| 363 assert(oop_addr == r->oop_addr(), "must be only one set-oop here"); | 363 assert(oop_addr == r->oop_addr(), "must be only one set-oop here"); |
| 364 } | 364 } |
| 365 } | 365 } |
| 366 if (iter.type() == relocInfo::metadata_type) { | 366 if (iter.type() == relocInfo::metadata_type) { |
| 476 while (iter.next()) { | 476 while (iter.next()) { |
| 477 if (iter.type() == relocInfo::oop_type) { | 477 if (iter.type() == relocInfo::oop_type) { |
| 478 oop_Relocation *r = iter.oop_reloc(); | 478 oop_Relocation *r = iter.oop_reloc(); |
| 479 if (oop_addr == NULL) { | 479 if (oop_addr == NULL) { |
| 480 oop_addr = r->oop_addr(); | 480 oop_addr = r->oop_addr(); |
| 481 *oop_addr = (oop)x; | 481 *oop_addr = cast_to_oop(x); |
| 482 } else { | 482 } else { |
| 483 assert(oop_addr == r->oop_addr(), "must be only one set-oop here"); | 483 assert(oop_addr == r->oop_addr(), "must be only one set-oop here"); |
| 484 } | 484 } |
| 485 } | 485 } |
| 486 if (iter.type() == relocInfo::metadata_type) { | 486 if (iter.type() == relocInfo::metadata_type) { |
