[PATCH] sim: add noreturn markings to more hw abort/halt funcs

[PATCH] sim: add noreturn markings to more hw abort/halt funcs

[Mike Frysinger]

These functions either call abort() themselves, or call functions which
are already marked noreturn.  Either way, they don't return, so mark them
as such so calling code can assume this.  This fixes some uninitialized
warnings due to code paths that end in an abort function.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

2010-01-08  Mike Frysinger  <vapier@gentoo.org>

	* hw-device.h (hw_abort, hw_vabort, hw_halt): Add noreturn attribute.
	* sim-hw.h (sim_hw_abort): Likewise.
---
 sim/common/hw-device.h |    6 +++---
 sim/common/sim-hw.h    |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sim/common/hw-device.h b/sim/common/hw-device.h
index 4ac61b1..b0f66eb 100644
--- a/sim/common/hw-device.h
+++ b/sim/common/hw-device.h
@@ -433,17 +433,17 @@ int hw_ioctl
 void hw_abort
 (struct hw *me,
  const char *fmt,
- ...) __attribute__ ((format (printf, 2, 3)));
+ ...) __attribute__ ((format (printf, 2, 3), noreturn));
 
 void hw_vabort
 (struct hw *me,
  const char *fmt,
- va_list ap);
+ va_list ap) __attribute__ ((noreturn));
 
 void hw_halt
 (struct hw *me,
  int reason,
- int status);
+ int status) __attribute__ ((noreturn));
 
 
 #define hw_trace_p(hw) ((hw)->trace_of_hw_p + 0)
diff --git a/sim/common/sim-hw.h b/sim/common/sim-hw.h
index 1e0d3b3..e85cecc 100644
--- a/sim/common/sim-hw.h
+++ b/sim/common/sim-hw.h
@@ -49,7 +49,7 @@ void sim_hw_abort
 (SIM_DESC sd,
  struct hw *hw,
  const char *fmt,
- ...) __attribute__ ((format (printf, 3, 4)));
+ ...) __attribute__ ((format (printf, 3, 4), noreturn));
 
 
 
-- 
1.7.3.1

Re: [PATCH] sim: add noreturn markings to more hw abort/halt funcs

[Doug Evans]

On Sat, Jan 8, 2011 at 6:14 PM, Mike Frysinger <vapier@gentoo.org> wrote:
> These functions either call abort() themselves, or call functions which
> are already marked noreturn.  Either way, they don't return, so mark them
> as such so calling code can assume this.  This fixes some uninitialized
> warnings due to code paths that end in an abort function.
>
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
>
> 2010-01-08  Mike Frysinger  <vapier@gentoo.org>
>
>        * hw-device.h (hw_abort, hw_vabort, hw_halt): Add noreturn attribute.
>        * sim-hw.h (sim_hw_abort): Likewise.

This is ok.

Re: [PATCH] sim: add noreturn markings to more hw abort/halt funcs

[Mike Frysinger]

On Mon, Jan 10, 2011 at 1:00 PM, Doug Evans wrote:
> On Sat, Jan 8, 2011 at 6:14 PM, Mike Frysinger wrote:
>> These functions either call abort() themselves, or call functions which
>> are already marked noreturn.  Either way, they don't return, so mark them
>> as such so calling code can assume this.  This fixes some uninitialized
>> warnings due to code paths that end in an abort function.
>>
>> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
>>
>> 2010-01-08  Mike Frysinger  <vapier@gentoo.org>
>>
>>        * hw-device.h (hw_abort, hw_vabort, hw_halt): Add noreturn attribute.
>>        * sim-hw.h (sim_hw_abort): Likewise.
>
> This is ok.

committed then, thanks !
-mike