Mercurial > hg > truffle
comparison src/cpu/x86/vm/assembler_x86.cpp @ 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 | 1eba0601f0dd |
children | 52b4284cb496 b1bc1af04c6e |
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. |
520 case REP8(0xB8): // movl/q r, #32/#64(oop?) | 520 case REP8(0xB8): // movl/q r, #32/#64(oop?) |
521 if (which == end_pc_operand) return ip + (is_64bit ? 8 : 4); | 521 if (which == end_pc_operand) return ip + (is_64bit ? 8 : 4); |
522 // these asserts are somewhat nonsensical | 522 // these asserts are somewhat nonsensical |
523 #ifndef _LP64 | 523 #ifndef _LP64 |
524 assert(which == imm_operand || which == disp32_operand, | 524 assert(which == imm_operand || which == disp32_operand, |
525 err_msg("which %d is_64_bit %d ip " INTPTR_FORMAT, which, is_64bit, ip)); | 525 err_msg("which %d is_64_bit %d ip " INTPTR_FORMAT, which, is_64bit, p2i(ip))); |
526 #else | 526 #else |
527 assert((which == call32_operand || which == imm_operand) && is_64bit || | 527 assert((which == call32_operand || which == imm_operand) && is_64bit || |
528 which == narrow_oop_operand && !is_64bit, | 528 which == narrow_oop_operand && !is_64bit, |
529 err_msg("which %d is_64_bit %d ip " INTPTR_FORMAT, which, is_64bit, ip)); | 529 err_msg("which %d is_64_bit %d ip " INTPTR_FORMAT, which, is_64bit, p2i(ip))); |
530 #endif // _LP64 | 530 #endif // _LP64 |
531 return ip; | 531 return ip; |
532 | 532 |
533 case 0x69: // imul r, a, #32 | 533 case 0x69: // imul r, a, #32 |
534 case 0xC7: // movl a, #32(oop?) | 534 case 0xC7: // movl a, #32(oop?) |