Mercurial > hg > graal-compiler

comparison src/cpu/ppc/vm/frame_ppc.cpp @ 20644:327e7269f90d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8048169: Change 8037816 breaks HS build on PPC64 and CPP-Interpreter platforms Summary: Fix the matching of format string parameter types to the actual argument types for the PPC64 and CPP-Interpreter files in the same way as 8037816 already did it for all the other files Reviewed-by: stefank, coleenp, dholmes
author coleenp
date Mon, 30 Jun 2014 14:58:52 -0400
parents fd1b9f02cc91
children
comparison
equal deleted inserted replaced
20642:ec2c6fdd1ce6 20644:327e7269f90d
1 /* 1 /*
2 * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
3 * Copyright 2012, 2014 SAP AG. All rights reserved. 3 * Copyright 2012, 2014 SAP AG. All rights reserved.
4 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5 * 5 *
6 * This code is free software; you can redistribute it and/or modify it 6 * This code is free software; you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License version 2 only, as 7 * under the terms of the GNU General Public License version 2 only, as
138 } 138 }
139 139
140 void frame::patch_pc(Thread* thread, address pc) { 140 void frame::patch_pc(Thread* thread, address pc) {
141 if (TracePcPatching) { 141 if (TracePcPatching) {
142 tty->print_cr("patch_pc at address " PTR_FORMAT " [" PTR_FORMAT " -> " PTR_FORMAT "]", 142 tty->print_cr("patch_pc at address " PTR_FORMAT " [" PTR_FORMAT " -> " PTR_FORMAT "]",
143 &((address*) _sp)[-1], ((address*) _sp)[-1], pc); 143 p2i(&((address*) _sp)[-1]), p2i(((address*) _sp)[-1]), p2i(pc));
144 } 144 }
145 own_abi()->lr = (uint64_t)pc; 145 own_abi()->lr = (uint64_t)pc;
146 _cb = CodeCache::find_blob(pc); 146 _cb = CodeCache::find_blob(pc);
147 if (_cb != NULL && _cb->is_nmethod() && ((nmethod*)_cb)->is_deopt_pc(_pc)) { 147 if (_cb != NULL && _cb->is_nmethod() && ((nmethod*)_cb)->is_deopt_pc(_pc)) {
148 address orig = (((nmethod*)_cb)->get_original_pc(this)); 148 address orig = (((nmethod*)_cb)->get_original_pc(this));