Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
8005088: remove unused NativeInstruction::test methods
Reviewed-by: iignatyev
  • Loading branch information
Vladimir Kozlov committed Jul 1, 2020
1 parent dc74336 commit bf04926d7219cc54e81a437eee72bd4efb66e2a0
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 53 deletions.
@@ -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 @@ class NativeInstruction {

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 @@ class NativeMovConstReg: public NativeInstruction {
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 @@ class NativeMovRegMem: public NativeInstruction {
void verify();
void print ();

// unit test stuff
static void test() {}

private:
inline friend NativeMovRegMem* nativeMovRegMem_at (address address);
};
@@ -432,8 +423,6 @@ class NativeLoadAddress: public NativeInstruction {
void verify();
void print ();

// unit test stuff
static void test() {}
};

// adrp x16, #page
@@ -488,9 +477,6 @@ class NativeJump: public NativeInstruction {

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
@@ -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 @@ class RawNativeInstruction {
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) {
@@ -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 @@ class NativeInstruction {

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 @@ class NativeCall: public NativeInstruction {
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 @@ class NativeFarCall: public NativeInstruction {

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 @@ class NativeMovConstReg: public NativeInstruction {

void verify();

// unit test stuff
static void test();

// Creation.
friend NativeMovConstReg* nativeMovConstReg_at(address address) {
NativeMovConstReg* test = (NativeMovConstReg*)address;
@@ -618,9 +606,6 @@ class NativeJump: public NativeInstruction {

void verify();

// Unit testing stuff
static void test();

// Insertion of native jump instruction.
static void insert(address code_pos, address entry);

@@ -94,9 +94,6 @@ class NativeInstruction {

public:

// unit test stuff
static void test() {} // override for testing

inline friend NativeInstruction* nativeInstruction_at(address address);
};

@@ -277,9 +274,6 @@ class NativeMovConstReg: public NativeInstruction {
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 @@ class NativeMovRegMem: public NativeInstruction {
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 @@ class NativeLoadAddress: public NativeMovRegMem {
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 @@ class NativeJump: public NativeInstruction {

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 @@ class NativeFarJump: public NativeInstruction {

void verify();

// Unit testing stuff
static void test() {}

};

inline NativeFarJump* nativeFarJump_at(address address) {

0 comments on commit bf04926

Please sign in to comment.