From 804169dd621a3ad3eec1a32ce30350de667fee80 Mon Sep 17 00:00:00 2001 From: aliaspider Date: Thu, 30 Oct 2014 00:23:30 +0100 Subject: apply a facelift --- source/sar.h | 58 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 27 deletions(-) (limited to 'source/sar.h') diff --git a/source/sar.h b/source/sar.h index 119c5b8..14d89d9 100644 --- a/source/sar.h +++ b/source/sar.h @@ -1,6 +1,6 @@ /******************************************************************************* Snes9x - Portable Super Nintendo Entertainment System (TM) emulator. - + (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com) and Jerremy Koot (jkoot@snes9x.com) @@ -43,46 +43,46 @@ S-DD1 C emulator code (c) Copyright 2003 Brad Jorsch with research by Andreas Naive and John Weidman - + S-RTC C emulator code (c) Copyright 2001 John Weidman - + ST010 C++ emulator code (c) Copyright 2003 Feather, Kris Bleakley, John Weidman and Matthew Kendora - Super FX x86 assembler emulator code - (c) Copyright 1998 - 2003 zsKnight, _Demo_, and pagefault + Super FX x86 assembler emulator code + (c) Copyright 1998 - 2003 zsKnight, _Demo_, and pagefault - Super FX C emulator code + Super FX C emulator code (c) Copyright 1997 - 1999 Ivar, Gary Henderson and John Weidman SH assembler code partly based on x86 assembler code - (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se) + (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se) + - Specific ports contains the works of other authors. See headers in individual files. - + Snes9x homepage: http://www.snes9x.com - + Permission to use, copy, modify and distribute Snes9x in both binary and source form, for non-commercial purposes, is hereby granted without fee, providing that this license information and copyright notice appear with all copies and any derived work. - + This software is provided 'as-is', without any express or implied warranty. In no event shall the authors be held liable for any damages arising from the use of this software. - + Snes9x is freeware for PERSONAL USE only. Commercial users should seek permission of the copyright holders first. Commercial use includes charging money for Snes9x or software derived from Snes9x. - + The copyright holders request that bug fixes and improvements to the code should be forwarded to them so everyone can benefit from the modifications in future versions. - + Super NES and Super Nintendo Entertainment System are trademarks of Nintendo Co., Limited and its subsidiary companies. *******************************************************************************/ @@ -91,7 +91,7 @@ #define _SAR_H_ #ifdef HAVE_CONFIG_H - #include +#include #endif #include "port.h" @@ -107,32 +107,36 @@ #define SAR64(b, n) ((b)>>(n)) #else -static inline int8 SAR8(const int8 b, const int n){ +static inline int8 SAR8(const int8 b, const int n) +{ #ifndef RIGHTSHIFT_INT8_IS_SAR - if(b<0) return (b>>n)|(-1<<(8-n)); + if (b < 0) return (b >> n) | (-1 << (8 - n)); #endif - return b>>n; + return b >> n; } -static inline int16 SAR16(const int16 b, const int n){ +static inline int16 SAR16(const int16 b, const int n) +{ #ifndef RIGHTSHIFT_INT16_IS_SAR - if(b<0) return (b>>n)|(-1<<(16-n)); + if (b < 0) return (b >> n) | (-1 << (16 - n)); #endif - return b>>n; + return b >> n; } -static inline int32 SAR32(const int32 b, const int n){ +static inline int32 SAR32(const int32 b, const int n) +{ #ifndef RIGHTSHIFT_INT32_IS_SAR - if(b<0) return (b>>n)|(-1<<(32-n)); + if (b < 0) return (b >> n) | (-1 << (32 - n)); #endif - return b>>n; + return b >> n; } -static inline int64 SAR64(const int64 b, const int n){ +static inline int64 SAR64(const int64 b, const int n) +{ #ifndef RIGHTSHIFT_INT64_IS_SAR - if(b<0) return (b>>n)|(-1<<(64-n)); + if (b < 0) return (b >> n) | (-1 << (64 - n)); #endif - return b>>n; + return b >> n; } #endif -- cgit v1.2.3