Mercurial > hg > truffle
comparison src/cpu/x86/vm/vm_version_x86.cpp @ 7458:4daebd4cc1dd
Merge
author | minqi |
---|---|
date | Mon, 24 Dec 2012 11:46:38 -0800 |
parents | 2c7f594145dc |
children | 00af3a3a8df4 4a916f2ce331 |
comparison
equal
deleted
inserted
replaced
7457:35431a769282 | 7458:4daebd4cc1dd |
---|---|
487 warning("AES instructions not available on this CPU"); | 487 warning("AES instructions not available on this CPU"); |
488 FLAG_SET_DEFAULT(UseAES, false); | 488 FLAG_SET_DEFAULT(UseAES, false); |
489 } | 489 } |
490 | 490 |
491 // The AES intrinsic stubs require AES instruction support (of course) | 491 // The AES intrinsic stubs require AES instruction support (of course) |
492 // but also require AVX and sse3 modes for instructions it use. | 492 // but also require sse3 mode for instructions it use. |
493 if (UseAES && (UseAVX > 0) && (UseSSE > 2)) { | 493 if (UseAES && (UseSSE > 2)) { |
494 if (FLAG_IS_DEFAULT(UseAESIntrinsics)) { | 494 if (FLAG_IS_DEFAULT(UseAESIntrinsics)) { |
495 UseAESIntrinsics = true; | 495 UseAESIntrinsics = true; |
496 } | 496 } |
497 } else if (UseAESIntrinsics) { | 497 } else if (UseAESIntrinsics) { |
498 if (!FLAG_IS_DEFAULT(UseAESIntrinsics)) | 498 if (!FLAG_IS_DEFAULT(UseAESIntrinsics)) |