|
155 | 155 | import org.graalvm.word.LocationIdentity; |
156 | 156 |
|
157 | 157 | import jdk.vm.ci.code.CodeCacheProvider; |
158 | | -import jdk.vm.ci.code.TargetDescription; |
159 | 158 | import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; |
160 | 159 | import jdk.vm.ci.meta.JavaKind; |
161 | 160 | import jdk.vm.ci.meta.MetaAccessProvider; |
@@ -629,21 +628,6 @@ public void initialize(HotSpotProviders providers, OptionValues options) { |
629 | 628 | registerForeignCall(CHACHA20Block, c.chacha20Block, NativeCall); |
630 | 629 | } |
631 | 630 |
|
632 | | - TargetDescription target = providers.getCodeCache().getTarget(); |
633 | | - |
634 | | - if (AESNode.isSupported(target.arch)) { |
635 | | - linkSnippetStubs(providers, options, IntrinsicStubsGen::new, AESNode.STUBS); |
636 | | - } |
637 | | - if (CounterModeAESNode.isSupported(target.arch)) { |
638 | | - linkSnippetStubs(providers, options, IntrinsicStubsGen::new, CounterModeAESNode.STUB); |
639 | | - } |
640 | | - if (CipherBlockChainingAESNode.isSupported(target.arch)) { |
641 | | - linkSnippetStubs(providers, options, IntrinsicStubsGen::new, CipherBlockChainingAESNode.STUBS); |
642 | | - } |
643 | | - if (GHASHProcessBlocksNode.isSupported(target.arch)) { |
644 | | - linkSnippetStubs(providers, options, IntrinsicStubsGen::new, GHASHProcessBlocksNode.STUB); |
645 | | - } |
646 | | - |
647 | 631 | registerSnippetStubs(providers, options); |
648 | 632 | registerStubCallFunctions(options, providers, runtime.getVMConfig()); |
649 | 633 | } |
@@ -675,6 +659,10 @@ private void registerSnippetStubs(HotSpotProviders providers, OptionValues optio |
675 | 659 | linkSnippetStubs(providers, options, IntrinsicStubsGen::new, BigIntegerMultiplyToLenNode.STUB); |
676 | 660 | linkSnippetStubs(providers, options, IntrinsicStubsGen::new, BigIntegerMulAddNode.STUB); |
677 | 661 | linkSnippetStubs(providers, options, IntrinsicStubsGen::new, BigIntegerSquareToLenNode.STUB); |
| 662 | + linkSnippetStubs(providers, options, IntrinsicStubsGen::new, AESNode.STUBS); |
| 663 | + linkSnippetStubs(providers, options, IntrinsicStubsGen::new, CounterModeAESNode.STUB); |
| 664 | + linkSnippetStubs(providers, options, IntrinsicStubsGen::new, CipherBlockChainingAESNode.STUBS); |
| 665 | + linkSnippetStubs(providers, options, IntrinsicStubsGen::new, GHASHProcessBlocksNode.STUB); |
678 | 666 | } |
679 | 667 |
|
680 | 668 | @FunctionalInterface |
|
0 commit comments