diff options
| -rw-r--r-- | include/gem5/asm/generic/m5op_flags.h | 54 | ||||
| -rw-r--r-- | include/gem5/asm/generic/m5ops.h | 2 | ||||
| -rw-r--r-- | include/gem5/m5ops.h (renamed from util/m5/m5op.h) | 13 | ||||
| -rw-r--r-- | util/m5/m5.c | 2 |
4 files changed, 62 insertions, 9 deletions
diff --git a/include/gem5/asm/generic/m5op_flags.h b/include/gem5/asm/generic/m5op_flags.h new file mode 100644 index 000000000..de44e0085 --- /dev/null +++ b/include/gem5/asm/generic/m5op_flags.h @@ -0,0 +1,54 @@ +/* + * 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. + * + * Authors: Nathan Binkert + * Ali Saidi + * Andreas Sandberg + */ + +#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 e3df3f69e..81569e025 100644 --- a/include/gem5/asm/generic/m5ops.h +++ b/include/gem5/asm/generic/m5ops.h @@ -45,6 +45,8 @@ #ifndef __GEM5_ASM_GENERIC_M5OPS_H__ #define __GEM5_ASM_GENERIC_M5OPS_H__ +#include <gem5/asm/generic/m5op_flags.h> + #define M5OP_ARM 0x00 #define M5OP_QUIESCE 0x01 #define M5OP_QUIESCE_NS 0x02 diff --git a/util/m5/m5op.h b/include/gem5/m5ops.h index 3a507e164..5062ac24b 100644 --- a/util/m5/m5op.h +++ b/include/gem5/m5ops.h @@ -29,8 +29,8 @@ * Ali Saidi */ -#ifndef __M5OP_H__ -#define __M5OP_H__ +#ifndef __GEM5_M5OP_H__ +#define __GEM5_M5OP_H__ #ifdef __cplusplus extern "C" { @@ -38,6 +38,8 @@ extern "C" { #include <stdint.h> +#include <gem5/asm/generic/m5op_flags.h> + void m5_arm(uint64_t address); void m5_quiesce(void); void m5_quiesce_ns(uint64_t ns); @@ -82,12 +84,7 @@ void m5a_l(char *lsm, const void *id, char *sm); void m5a_identify(uint64_t id); uint64_t m5a_getid(void); -#define M5_AN_FL_NONE 0x0 -#define M5_AN_FL_BAD 0x2 -#define M5_AN_FL_LINK 0x10 -#define M5_AN_FL_RESET 0x20 - #ifdef __cplusplus } #endif -#endif // __M5OP_H__ +#endif // __GEM5_M5OP_H__ diff --git a/util/m5/m5.c b/util/m5/m5.c index 5b6c7a6aa..82ef73b0f 100644 --- a/util/m5/m5.c +++ b/util/m5/m5.c @@ -57,7 +57,7 @@ #include <sys/types.h> #include <unistd.h> -#include "m5op.h" +#include <gem5/m5ops.h> void *m5_mem = NULL; |