util: Move m5op.h to the shared include directory

The header file with C declarations for m5ops is sometimes needed by
code outside of the util/m5 directory. Move this file to the shared
include directory and factor out flags to a generic asm header. Note
that applications that need to call m5ops still need to link with
libm5.a or implement their own trampolines.

Change-Id: I36a3f459ed71593e38b869dc2b1302c810f92276
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Jose Marinho <jose.marinho@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/4265
Reviewed-by: Gabe Black <gabeblack@google.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>

2 files changed, 1 insertions, 94 deletions

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;
 
diff --git a/util/m5/m5op.h b/util/m5/m5op.h
deleted file mode 100644
index 3a507e164..000000000
--- a/util/m5/m5op.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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
- */
-
-#ifndef __M5OP_H__
-#define __M5OP_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-
-void m5_arm(uint64_t address);
-void m5_quiesce(void);
-void m5_quiesce_ns(uint64_t ns);
-void m5_quiesce_cycle(uint64_t cycles);
-uint64_t m5_quiesce_time(void);
-uint64_t m5_rpns();
-void m5_wake_cpu(uint64_t cpuid);
-
-void m5_exit(uint64_t ns_delay);
-void m5_fail(uint64_t ns_delay, uint64_t code);
-uint64_t m5_init_param(uint64_t key_str1, uint64_t key_str2);
-void m5_checkpoint(uint64_t ns_delay, uint64_t ns_period);
-void m5_reset_stats(uint64_t ns_delay, uint64_t ns_period);
-void m5_dump_stats(uint64_t ns_delay, uint64_t ns_period);
-void m5_dump_reset_stats(uint64_t ns_delay, uint64_t ns_period);
-uint64_t m5_read_file(void *buffer, uint64_t len, uint64_t offset);
-uint64_t m5_write_file(void *buffer, uint64_t len, uint64_t offset,
-                       const char *filename);
-void m5_debug_break(void);
-void m5_switch_cpu(void);
-void m5_dist_toggle_sync(void);
-void m5_add_symbol(uint64_t addr, char *symbol);
-void m5_loadsymbol();
-void m5_panic(void);
-void m5_work_begin(uint64_t workid, uint64_t threadid);
-void m5_work_end(uint64_t workid, uint64_t threadid);
-
-// These operations are for critical path annotation
-void m5a_bsm(char *sm, const void *id, int flags);
-void m5a_esm(char *sm);
-void m5a_begin(int flags, char *st);
-void m5a_end(void);
-void m5a_q(const void *id, char *q, int count);
-void m5a_dq(const void *id, char *q, int count);
-void m5a_wf(const void *id, char *q, char *sm, int count);
-void m5a_we(const void *id, char *q, char *sm, int count);
-void m5a_ws(const void *id, char *q, char *sm);
-void m5a_sq(const void *id, char *q, int count, int flags);
-void m5a_aq(const void *id, char *q, int count);
-void m5a_pq(const void *id, char *q, int count);
-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__