Mercurial > hg > truffle
comparison src/share/vm/asm/codeBuffer.hpp @ 17937:78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
8043029: Change 8037816 breaks HS build with older GCC versions which don't support diagnostic pragmas
8043164: Format warning in traceStream.hpp
Summary: Backport of main fix + two corrections, enables clang compilation, turns on format attributes, corrects/mutes warnings
Reviewed-by: kvn, coleenp, iveresov, twisti
author | drchase |
---|---|
date | Thu, 22 May 2014 15:52:41 -0400 |
parents | 9758d9f36299 |
children | 094cbdffa87d |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1997, 2014, 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. |
171 bool contains(address pc) const { return pc >= _start && pc < _end; } | 171 bool contains(address pc) const { return pc >= _start && pc < _end; } |
172 bool contains2(address pc) const { return pc >= _start && pc <= _end; } | 172 bool contains2(address pc) const { return pc >= _start && pc <= _end; } |
173 bool allocates(address pc) const { return pc >= _start && pc < _limit; } | 173 bool allocates(address pc) const { return pc >= _start && pc < _limit; } |
174 bool allocates2(address pc) const { return pc >= _start && pc <= _limit; } | 174 bool allocates2(address pc) const { return pc >= _start && pc <= _limit; } |
175 | 175 |
176 void set_end(address pc) { assert(allocates2(pc), err_msg("not in CodeBuffer memory: " PTR_FORMAT " <= " PTR_FORMAT " <= " PTR_FORMAT, _start, pc, _limit)); _end = pc; } | 176 void set_end(address pc) { assert(allocates2(pc), err_msg("not in CodeBuffer memory: " PTR_FORMAT " <= " PTR_FORMAT " <= " INTPTR_FORMAT, p2i(_start), p2i(pc), p2i(_limit))); _end = pc; } |
177 void set_mark(address pc) { assert(contains2(pc), "not in codeBuffer"); | 177 void set_mark(address pc) { assert(contains2(pc), "not in codeBuffer"); |
178 _mark = pc; } | 178 _mark = pc; } |
179 void set_mark_off(int offset) { assert(contains2(offset+_start),"not in codeBuffer"); | 179 void set_mark_off(int offset) { assert(contains2(offset+_start),"not in codeBuffer"); |
180 _mark = offset + _start; } | 180 _mark = offset + _start; } |
181 void set_mark() { _mark = _end; } | 181 void set_mark() { _mark = _end; } |