Mercurial > hg > graal-compiler

comparison src/cpu/sparc/vm/nativeInst_sparc.cpp @ 12355:cefad50507d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with hs25-b53
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 10:38:03 +0200
parents 6b0fd0964b87 190899198332
children b51e29501f30
comparison
equal deleted inserted replaced
12058:ccb4f2af2319 12355:cefad50507d8
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.
358 while (iter.next()) { 358 while (iter.next()) {
359 if (iter.type() == relocInfo::oop_type) { 359 if (iter.type() == relocInfo::oop_type) {
360 oop_Relocation *r = iter.oop_reloc(); 360 oop_Relocation *r = iter.oop_reloc();
361 if (oop_addr == NULL) { 361 if (oop_addr == NULL) {
362 oop_addr = r->oop_addr(); 362 oop_addr = r->oop_addr();
363 *oop_addr = (oop)x; 363 *oop_addr = cast_to_oop(x);
364 } else { 364 } else {
365 assert(oop_addr == r->oop_addr(), "must be only one set-oop here"); 365 assert(oop_addr == r->oop_addr(), "must be only one set-oop here");
366 } 366 }
367 } 367 }
368 if (iter.type() == relocInfo::metadata_type) { 368 if (iter.type() == relocInfo::metadata_type) {
478 while (iter.next()) { 478 while (iter.next()) {
479 if (iter.type() == relocInfo::oop_type) { 479 if (iter.type() == relocInfo::oop_type) {
480 oop_Relocation *r = iter.oop_reloc(); 480 oop_Relocation *r = iter.oop_reloc();
481 if (oop_addr == NULL) { 481 if (oop_addr == NULL) {
482 oop_addr = r->oop_addr(); 482 oop_addr = r->oop_addr();
483 *oop_addr = (oop)x; 483 *oop_addr = cast_to_oop(x);
484 } else { 484 } else {
485 assert(oop_addr == r->oop_addr(), "must be only one set-oop here"); 485 assert(oop_addr == r->oop_addr(), "must be only one set-oop here");
486 } 486 }
487 } 487 }
488 if (iter.type() == relocInfo::metadata_type) { 488 if (iter.type() == relocInfo::metadata_type) {