OpenJDK / jdk / jdk
changeset 60017:c5ed42533134
8005088: remove unused NativeInstruction::test methods
Reviewed-by: iignatyev
| author | kvn |
|---|---|
| date | Wed, 01 Jul 2020 15:37:56 -0700 |
| parents | 47f11f0fcb42 |
| children | f6b7804c6f78 |
| files | src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp src/hotspot/cpu/arm/nativeInst_arm_32.hpp src/hotspot/cpu/s390/nativeInst_s390.hpp src/hotspot/cpu/x86/nativeInst_x86.hpp |
| diffstat | 4 files changed, 3 insertions(+), 53 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp Wed Jul 01 21:05:14 2020 +0000 +++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp Wed Jul 01 15:37:56 2020 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2108, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -102,9 +102,6 @@ public: - // unit test stuff - static void test() {} // override for testing - inline friend NativeInstruction* nativeInstruction_at(address address); static bool is_adrp_at(address instr); @@ -321,9 +318,6 @@ void verify(); void print(); - // unit test stuff - static void test() {} - // Creation inline friend NativeMovConstReg* nativeMovConstReg_at(address address); inline friend NativeMovConstReg* nativeMovConstReg_before(address address); @@ -397,9 +391,6 @@ void verify(); void print (); - // unit test stuff - static void test() {} - private: inline friend NativeMovRegMem* nativeMovRegMem_at (address address); }; @@ -432,8 +423,6 @@ void verify(); void print (); - // unit test stuff - static void test() {} }; // adrp x16, #page @@ -488,9 +477,6 @@ void verify(); - // Unit testing stuff - static void test() {} - // Insertion of native jump instruction static void insert(address code_pos, address entry); // MT-safe insertion of native jump at verified method entry
--- a/src/hotspot/cpu/arm/nativeInst_arm_32.hpp Wed Jul 01 21:05:14 2020 +0000 +++ b/src/hotspot/cpu/arm/nativeInst_arm_32.hpp Wed Jul 01 15:37:56 2020 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -145,9 +145,6 @@ bool is_movt() const { return (encoding() & 0x0ff00000) == 0x03400000; } // c2 doesn't use fixed registers for safepoint poll address bool is_safepoint_poll() const { return (encoding() & 0xfff0ffff) == 0xe590c000; } - // For unit tests - static void test() {} - }; inline RawNativeInstruction* rawNativeInstruction_at(address address) {
--- a/src/hotspot/cpu/s390/nativeInst_s390.hpp Wed Jul 01 21:05:14 2020 +0000 +++ b/src/hotspot/cpu/s390/nativeInst_s390.hpp Wed Jul 01 15:37:56 2020 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -137,9 +137,6 @@ void verify(); - // unit test stuff - static void test() {} // Override for testing. - friend NativeInstruction* nativeInstruction_at(address address) { NativeInstruction* inst = (NativeInstruction*)address; #ifdef ASSERT @@ -274,9 +271,6 @@ void verify_alignment() {} // Yet another real do nothing guy :) void verify(); - // unit test stuff - static void test(); - // Creation. friend NativeCall* nativeCall_at(address instr) { NativeCall* call; @@ -443,9 +437,6 @@ void verify(); - // Unit tests - static void test(); - // Instantiates a NativeFarCall object starting at the given instruction // address and returns the NativeFarCall object. inline friend NativeFarCall* nativeFarCall_at(address instr) { @@ -500,9 +491,6 @@ void verify(); - // unit test stuff - static void test(); - // Creation. friend NativeMovConstReg* nativeMovConstReg_at(address address) { NativeMovConstReg* test = (NativeMovConstReg*)address; @@ -618,9 +606,6 @@ void verify(); - // Unit testing stuff - static void test(); - // Insertion of native jump instruction. static void insert(address code_pos, address entry);
--- a/src/hotspot/cpu/x86/nativeInst_x86.hpp Wed Jul 01 21:05:14 2020 +0000 +++ b/src/hotspot/cpu/x86/nativeInst_x86.hpp Wed Jul 01 15:37:56 2020 -0700 @@ -94,9 +94,6 @@ public: - // unit test stuff - static void test() {} // override for testing - inline friend NativeInstruction* nativeInstruction_at(address address); }; @@ -277,9 +274,6 @@ void verify(); void print(); - // unit test stuff - static void test() {} - // Creation inline friend NativeMovConstReg* nativeMovConstReg_at(address address); inline friend NativeMovConstReg* nativeMovConstReg_before(address address); @@ -393,9 +387,6 @@ void verify(); void print (); - // unit test stuff - static void test() {} - private: int patch_offset() const; inline friend NativeMovRegMem* nativeMovRegMem_at (address address); @@ -432,9 +423,6 @@ void verify(); void print (); - // unit test stuff - static void test() {} - private: friend NativeLoadAddress* nativeLoadAddress_at (address address) { NativeLoadAddress* test = (NativeLoadAddress*)(address - instruction_offset); @@ -536,9 +524,6 @@ void verify(); - // Unit testing stuff - static void test() {} - // Insertion of native jump instruction static void insert(address code_pos, address entry); // MT-safe insertion of native jump at verified method entry @@ -564,9 +549,6 @@ void verify(); - // Unit testing stuff - static void test() {} - }; inline NativeFarJump* nativeFarJump_at(address address) {