From 744eecd9e0c68afa7b8469cbf36f9d226a2187a0 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 25 Mar 2020 15:04:22 -0700 Subject: [PATCH] misc: Get rid of the m5op_flags.h header. This held flags for use with the critical path annotation instructions which are no longer accessible through the m5 utility and so not used. Change-Id: Ifee85ce78bb33c4a3e8c0db845974f17d8867199 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27221 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- include/gem5/asm/generic/m5op_flags.h | 50 --------------------------- include/gem5/asm/generic/m5ops.h | 2 -- include/gem5/m5ops.h | 2 -- 3 files changed, 54 deletions(-) delete mode 100644 include/gem5/asm/generic/m5op_flags.h diff --git a/include/gem5/asm/generic/m5op_flags.h b/include/gem5/asm/generic/m5op_flags.h deleted file mode 100644 index 0304b8848..000000000 --- a/include/gem5/asm/generic/m5op_flags.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2017 ARM Limited - * All rights reserved - * - * The license below extends only to copyright in the software and shall - * not be construed as granting a license to any other intellectual - * property including but not limited to intellectual property relating - * to a hardware implementation of the functionality of the software - * licensed hereunder. You may use the software subject to the license - * terms below provided that you ensure that this notice is replicated - * unmodified and in its entirety in all distributions of the software, - * modified or unmodified, in source code or in binary form. - * - * Copyright (c) 2003-2006 The Regents of The University of Michigan - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer; - * redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution; - * neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef __GEM5_ASM_GENERIC_M5OP_FLAGS_H__ -#define __GEM5_ASM_GENERIC_M5OP_FLAGS_H__ - -/* Flags for annotation calls */ -#define M5_AN_FL_NONE 0x0 -#define M5_AN_FL_BAD 0x2 -#define M5_AN_FL_LINK 0x10 -#define M5_AN_FL_RESET 0x20 - -#endif // __GEM5_ASM_GENERIC_M5OP_FLAGS_H__ diff --git a/include/gem5/asm/generic/m5ops.h b/include/gem5/asm/generic/m5ops.h index e887b72fe..f1e82983d 100644 --- a/include/gem5/asm/generic/m5ops.h +++ b/include/gem5/asm/generic/m5ops.h @@ -41,8 +41,6 @@ #ifndef __GEM5_ASM_GENERIC_M5OPS_H__ #define __GEM5_ASM_GENERIC_M5OPS_H__ -#include - #define M5OP_ARM 0x00 #define M5OP_QUIESCE 0x01 #define M5OP_QUIESCE_NS 0x02 diff --git a/include/gem5/m5ops.h b/include/gem5/m5ops.h index b118f4a86..440ea2d38 100644 --- a/include/gem5/m5ops.h +++ b/include/gem5/m5ops.h @@ -35,8 +35,6 @@ extern "C" { #include -#include - void m5_arm(uint64_t address); void m5_quiesce(void); void m5_quiesce_ns(uint64_t ns); -- 2.30.2