aboutsummaryrefslogtreecommitdiff
path: root/sim/common
diff options
context:
space:
mode:
Diffstat (limited to 'sim/common')
-rw-r--r--sim/common/ChangeLog23
-rw-r--r--sim/common/callback.c5
-rw-r--r--sim/common/hw-device.h8
-rw-r--r--sim/common/hw-events.h2
-rw-r--r--sim/common/hw-tree.h2
-rw-r--r--sim/common/sim-basics.h9
-rw-r--r--sim/common/sim-engine.h6
-rw-r--r--sim/common/sim-hw.h4
-rw-r--r--sim/common/sim-inline.h16
-rw-r--r--sim/common/sim-io.h8
-rw-r--r--sim/common/sim-profile.c2
-rw-r--r--sim/common/sim-trace.h10
12 files changed, 45 insertions, 50 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 7abaeb3..4aeae9c 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,26 @@
+2021-05-02 Mike Frysinger <vapier@gentoo.org>
+
+ * callback.c (os_error): Change __attribute__((noreturn)) to
+ ATTRIBUTE_NORETURN.
+ * hw-device.h (hw_abort, hw_vabort, hw_halthw_trace): Change
+ attributes to ATTRIBUTE_PRINTF and ATTRIBUTE_NORETURN.
+ * hw-events.h (hw_event_queue_schedule_tracef): Likewise.
+ * hw-tree.h (hw_tree_delete): Likewise.
+ * sim-basics.h (__attribute__): Delete.
+ * sim-engine.h (sim_engine_halt): Change __attribute__((noreturn))
+ to ATTRIBUTE_NORETURN.
+ (sim_engine_abort, sim_engine_vabort): Likewise.
+ * sim-hw.h (sim_hw_install, sim_hw_abort): Change
+ __attribute__((printf)) to ATTRIBUTE_PRINTF.
+ * sim-inline.h (NORETURN): Delete.
+ (UNUSED): Change to ATTRIBUTE_UNUSED.
+ * sim-io.h (sim_io_printf): Change attributes to ATTRIBUTE_PRINTF
+ and ATTRIBUTE_NORETURN.
+ (sim_io_eprintf, sim_io_error): Likewise.
+ * sim-profile.c (profile_printf): Likewise.
+ * sim-trace.h (trace_prefix, trace_generic, trace_printf,
+ sim_debug_printf): Likewise.
+
2021-05-01 Mike Frysinger <vapier@gentoo.org>
* sim-options.c (dup_arg_p): Call htab_empty.
diff --git a/sim/common/callback.c b/sim/common/callback.c
index aae0630..55280ab 100644
--- a/sim/common/callback.c
+++ b/sim/common/callback.c
@@ -698,10 +698,7 @@ os_evprintf_filtered (host_callback *p ATTRIBUTE_UNUSED, const char *format, va_
}
/* VARARGS */
-#ifdef __GNUC__
-__attribute__ ((__noreturn__))
-#endif
-static void ATTRIBUTE_PRINTF (2, 3)
+static void ATTRIBUTE_PRINTF (2, 3) ATTRIBUTE_NORETURN
os_error (host_callback *p ATTRIBUTE_UNUSED, const char *format, ...)
{
va_list args;
diff --git a/sim/common/hw-device.h b/sim/common/hw-device.h
index a745cb7..ffd627a 100644
--- a/sim/common/hw-device.h
+++ b/sim/common/hw-device.h
@@ -432,17 +432,17 @@ int hw_ioctl
void hw_abort
(struct hw *me,
const char *fmt,
- ...) __attribute__ ((format (printf, 2, 3), noreturn));
+ ...) ATTRIBUTE_PRINTF (2, 3) ATTRIBUTE_NORETURN;
void hw_vabort
(struct hw *me,
const char *fmt,
- va_list ap) __attribute__ ((noreturn));
+ va_list ap) ATTRIBUTE_NORETURN;
void hw_halt
(struct hw *me,
int reason,
- int status) __attribute__ ((noreturn));
+ int status) ATTRIBUTE_NORETURN;
#define hw_trace_p(hw) ((hw)->trace_of_hw_p + 0)
@@ -450,7 +450,7 @@ void hw_halt
void hw_trace
(struct hw *me,
const char *fmt,
- ...) __attribute__ ((format (printf, 2, 3)));
+ ...) ATTRIBUTE_PRINTF (2, 3);
#define HW_TRACE(ARGS) \
do { \
diff --git a/sim/common/hw-events.h b/sim/common/hw-events.h
index 9307f8d..901063b 100644
--- a/sim/common/hw-events.h
+++ b/sim/common/hw-events.h
@@ -39,7 +39,7 @@ struct hw_event *hw_event_queue_schedule_tracef
hw_event_callback *handler,
void *data,
const char *fmt,
- ...) __attribute__ ((format (printf, 5, 6)));
+ ...) ATTRIBUTE_PRINTF (5, 6);
struct hw_event *hw_event_queue_schedule_vtracef
(struct hw *me,
diff --git a/sim/common/hw-tree.h b/sim/common/hw-tree.h
index 55975df..86ebf17 100644
--- a/sim/common/hw-tree.h
+++ b/sim/common/hw-tree.h
@@ -34,7 +34,7 @@ void hw_tree_delete
struct hw *hw_tree_parse
(struct hw *root,
const char *fmt,
- ...) __attribute__ ((format (printf, 2, 3)));
+ ...) ATTRIBUTE_PRINTF (2, 3);
struct hw *hw_tree_vparse
(struct hw *root,
diff --git a/sim/common/sim-basics.h b/sim/common/sim-basics.h
index 52c9b2f..e822fb2 100644
--- a/sim/common/sim-basics.h
+++ b/sim/common/sim-basics.h
@@ -51,15 +51,6 @@
#endif
-/* Some versions of GCC include an attribute operator, define it */
-
-#if !defined (__attribute__)
-#if (!defined(__GNUC__) || (__GNUC__ < 2) || (__GNUC__ == 2 && __GNUC_MINOR__ < 6))
-#define __attribute__(arg)
-#endif
-#endif
-
-
/* Global types that code manipulates */
struct hw;
diff --git a/sim/common/sim-engine.h b/sim/common/sim-engine.h
index 5adce8d..3ebf8ac 100644
--- a/sim/common/sim-engine.h
+++ b/sim/common/sim-engine.h
@@ -62,7 +62,7 @@ extern void sim_engine_halt
sim_cpu *next_cpu, /* NULL -> succ (last_cpu) or event-mgr */
sim_cia cia,
enum sim_stop reason,
- int sigrc) __attribute__ ((noreturn));
+ int sigrc) ATTRIBUTE_NORETURN;
/* Halt hook - allow target specific operation when halting a
simulator */
@@ -115,14 +115,14 @@ extern void sim_engine_abort
sim_cpu *cpu,
sim_cia cia,
const char *fmt,
- ...) ATTRIBUTE_PRINTF (4, 5) __attribute__ ((noreturn));
+ ...) ATTRIBUTE_PRINTF (4, 5) ATTRIBUTE_NORETURN;
extern void sim_engine_vabort
(SIM_DESC sd,
sim_cpu *cpu,
sim_cia cia,
const char *fmt,
- va_list ap) ATTRIBUTE_PRINTF (4, 0) __attribute__ ((noreturn));
+ va_list ap) ATTRIBUTE_PRINTF (4, 0) ATTRIBUTE_NORETURN;
/* No abort hook - when possible this function exits using the
engine_halt function (and SIM_ENGINE_HALT_HOOK). */
diff --git a/sim/common/sim-hw.h b/sim/common/sim-hw.h
index 95b9856..976a220 100644
--- a/sim/common/sim-hw.h
+++ b/sim/common/sim-hw.h
@@ -32,7 +32,7 @@ SIM_RC sim_hw_install
struct hw *sim_hw_parse
(struct sim_state *sd,
const char *fmt,
- ...) __attribute__ ((format (printf, 2, 3)));
+ ...) ATTRIBUTE_PRINTF (2, 3);
/* Print the hardware tree */
@@ -48,7 +48,7 @@ void sim_hw_abort
(SIM_DESC sd,
struct hw *hw,
const char *fmt,
- ...) __attribute__ ((format (printf, 3, 4), noreturn));
+ ...) ATTRIBUTE_PRINTF (3, 4) ATTRIBUTE_NORETURN;
diff --git a/sim/common/sim-inline.h b/sim/common/sim-inline.h
index ed7baa4..2750fa9 100644
--- a/sim/common/sim-inline.h
+++ b/sim/common/sim-inline.h
@@ -325,24 +325,10 @@
#endif
-/* Your compiler's no-return reserved word */
-
-#ifndef NORETURN
-#define NORETURN
-#endif
-
-
-
/* Your compilers's unused reserved word */
#if !defined (UNUSED)
-#if (!defined (__GNUC__) \
- || (__GNUC__ < 2) \
- || (__GNUC__ == 2 && __GNUC_MINOR__ < 7))
-#define UNUSED
-#else
-#define UNUSED __attribute__((__unused__))
-#endif
+#define UNUSED ATTRIBUTE_UNUSED
#endif
diff --git a/sim/common/sim-io.h b/sim/common/sim-io.h
index 33dfa78..f018538 100644
--- a/sim/common/sim-io.h
+++ b/sim/common/sim-io.h
@@ -63,21 +63,21 @@ int sim_io_close (SIM_DESC sd, int);
void sim_io_printf (SIM_DESC sd,
const char *fmt,
- ...) __attribute__ ((format (printf, 2, 3)));
+ ...) ATTRIBUTE_PRINTF (2, 3);
void sim_io_vprintf (SIM_DESC sd, const char *fmt, va_list ap);
void sim_io_eprintf (SIM_DESC sd,
const char *fmt,
- ...) __attribute__ ((format (printf, 2, 3)));
+ ...) ATTRIBUTE_PRINTF (2, 3);
void sim_io_evprintf (SIM_DESC sd, const char *fmt, va_list ap);
void sim_io_error (SIM_DESC sd,
const char *fmt,
...)
- __attribute__ ((format (printf, 2, 3)))
- __attribute__ ((__noreturn__));
+ ATTRIBUTE_PRINTF (2, 3)
+ ATTRIBUTE_NORETURN;
void sim_io_poll_quit (SIM_DESC sd);
diff --git a/sim/common/sim-profile.c b/sim/common/sim-profile.c
index 5508f0f..75bdc70 100644
--- a/sim/common/sim-profile.c
+++ b/sim/common/sim-profile.c
@@ -466,7 +466,7 @@ profile_vprintf (SIM_DESC sd, sim_cpu *cpu, const char *fmt, va_list ap)
sim_io_evprintf (sd, fmt, ap);
}
-__attribute__ ((format (printf, 3, 4)))
+ATTRIBUTE_PRINTF (3, 4)
static void
profile_printf (SIM_DESC sd, sim_cpu *cpu, const char *fmt, ...)
{
diff --git a/sim/common/sim-trace.h b/sim/common/sim-trace.h
index e96e684..7ff7b02 100644
--- a/sim/common/sim-trace.h
+++ b/sim/common/sim-trace.h
@@ -333,8 +333,7 @@ extern void trace_prefix (SIM_DESC sd,
const char *file_name,
int line_nr,
const char *fmt,
- ...)
- __attribute__((format (printf, 8, 9)));
+ ...) ATTRIBUTE_PRINTF (8, 9);
/* Generic trace print, assumes trace_prefix() has been called */
@@ -342,8 +341,7 @@ extern void trace_generic (SIM_DESC sd,
sim_cpu *cpu,
int trace_idx,
const char *fmt,
- ...)
- __attribute__((format (printf, 4, 5)));
+ ...) ATTRIBUTE_PRINTF (4, 5);
/* Disassemble the specified address. */
@@ -655,7 +653,7 @@ do { \
extern void trace_printf (SIM_DESC, sim_cpu *, const char *, ...)
- __attribute__((format (printf, 3, 4)));
+ ATTRIBUTE_PRINTF (3, 4);
extern void trace_vprintf (SIM_DESC, sim_cpu *, const char *, va_list);
@@ -676,6 +674,6 @@ int trace_load_symbols (SIM_DESC);
bfd_vma trace_sym_value (SIM_DESC, const char *name);
extern void sim_debug_printf (sim_cpu *, const char *, ...)
- __attribute__((format (printf, 2, 3)));
+ ATTRIBUTE_PRINTF (2, 3);
#endif /* SIM_TRACE_H */
generated by cgit v1.1 at 2024-07-14 14:56:10 +0000