Mercurial > hg > truffle
comparison src/cpu/x86/vm/vm_version_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. |
923 | 923 |
924 #ifndef PRODUCT | 924 #ifndef PRODUCT |
925 if (PrintMiscellaneous && Verbose) { | 925 if (PrintMiscellaneous && Verbose) { |
926 tty->print_cr("Logical CPUs per core: %u", | 926 tty->print_cr("Logical CPUs per core: %u", |
927 logical_processors_per_package()); | 927 logical_processors_per_package()); |
928 tty->print("UseSSE=%d",UseSSE); | 928 tty->print("UseSSE=%d", (int) UseSSE); |
929 if (UseAVX > 0) { | 929 if (UseAVX > 0) { |
930 tty->print(" UseAVX=%d",UseAVX); | 930 tty->print(" UseAVX=%d", (int) UseAVX); |
931 } | 931 } |
932 if (UseAES) { | 932 if (UseAES) { |
933 tty->print(" UseAES=1"); | 933 tty->print(" UseAES=1"); |
934 } | 934 } |
935 #ifdef COMPILER2 | 935 #ifdef COMPILER2 |
936 if (MaxVectorSize > 0) { | 936 if (MaxVectorSize > 0) { |
937 tty->print(" MaxVectorSize=%d", MaxVectorSize); | 937 tty->print(" MaxVectorSize=%d", (int) MaxVectorSize); |
938 } | 938 } |
939 #endif | 939 #endif |
940 tty->cr(); | 940 tty->cr(); |
941 tty->print("Allocation"); | 941 tty->print("Allocation"); |
942 if (AllocatePrefetchStyle <= 0 || UseSSE == 0 && !supports_3dnow_prefetch()) { | 942 if (AllocatePrefetchStyle <= 0 || UseSSE == 0 && !supports_3dnow_prefetch()) { |
955 } else if (AllocatePrefetchInstr == 3) { | 955 } else if (AllocatePrefetchInstr == 3) { |
956 tty->print("PREFETCHW"); | 956 tty->print("PREFETCHW"); |
957 } | 957 } |
958 } | 958 } |
959 if (AllocatePrefetchLines > 1) { | 959 if (AllocatePrefetchLines > 1) { |
960 tty->print_cr(" at distance %d, %d lines of %d bytes", AllocatePrefetchDistance, AllocatePrefetchLines, AllocatePrefetchStepSize); | 960 tty->print_cr(" at distance %d, %d lines of %d bytes", (int) AllocatePrefetchDistance, (int) AllocatePrefetchLines, (int) AllocatePrefetchStepSize); |
961 } else { | 961 } else { |
962 tty->print_cr(" at distance %d, one line of %d bytes", AllocatePrefetchDistance, AllocatePrefetchStepSize); | 962 tty->print_cr(" at distance %d, one line of %d bytes", (int) AllocatePrefetchDistance, (int) AllocatePrefetchStepSize); |
963 } | 963 } |
964 } | 964 } |
965 | 965 |
966 if (PrefetchCopyIntervalInBytes > 0) { | 966 if (PrefetchCopyIntervalInBytes > 0) { |
967 tty->print_cr("PrefetchCopyIntervalInBytes %d", PrefetchCopyIntervalInBytes); | 967 tty->print_cr("PrefetchCopyIntervalInBytes %d", (int) PrefetchCopyIntervalInBytes); |
968 } | 968 } |
969 if (PrefetchScanIntervalInBytes > 0) { | 969 if (PrefetchScanIntervalInBytes > 0) { |
970 tty->print_cr("PrefetchScanIntervalInBytes %d", PrefetchScanIntervalInBytes); | 970 tty->print_cr("PrefetchScanIntervalInBytes %d", (int) PrefetchScanIntervalInBytes); |
971 } | 971 } |
972 if (PrefetchFieldsAhead > 0) { | 972 if (PrefetchFieldsAhead > 0) { |
973 tty->print_cr("PrefetchFieldsAhead %d", PrefetchFieldsAhead); | 973 tty->print_cr("PrefetchFieldsAhead %d", (int) PrefetchFieldsAhead); |
974 } | 974 } |
975 if (ContendedPaddingWidth > 0) { | 975 if (ContendedPaddingWidth > 0) { |
976 tty->print_cr("ContendedPaddingWidth %d", ContendedPaddingWidth); | 976 tty->print_cr("ContendedPaddingWidth %d", (int) ContendedPaddingWidth); |
977 } | 977 } |
978 } | 978 } |
979 #endif // !PRODUCT | 979 #endif // !PRODUCT |
980 } | 980 } |
981 | 981 |