head 1.2; access; symbols pkgsrc-2019Q4:1.1.0.118 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.114 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.112 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.110 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.108 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.106 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.104 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.102 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.100 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.98 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.94 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.92 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.90 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.88 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.86 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.84 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.82 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.80 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.78 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.76 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.74 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.72 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.70 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.68 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.66 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.64 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.62 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.60 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.58 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.56 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.54 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.52 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.50 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.48 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.46 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.44 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.42 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.40 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.38 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.36 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.34 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.32 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.30 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.28 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.26 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.24 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.22 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.20 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.18 pkgsrc-2008Q1:1.1.0.16 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.14 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.12 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.10 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.8 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.6 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.4 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.2 pkgsrc-2006Q2-base:1.1; locks; strict; comment @# @; 1.2 date 2020.01.29.10.33.17; author nia; state dead; branches; next 1.1; commitid NaWbZoXZ0LF0BzUB; 1.1 date 2006.06.26.10.56.57; author rillig; state Exp; branches; next ; desc @@ 1.2 log @gcube: Remove, succeeded by emulators/dolphin-emu @ text @$NetBSD: patch-ad,v 1.1 2006/06/26 10:56:57 rillig Exp $ Thou shalt not use reserved identifiers. --- cpu.h.orig 2005-01-12 01:19:11.000000000 +0100 +++ cpu.h 2006-06-26 12:51:48.000000000 +0200 @@@@ -284,8 +284,8 @@@@ extern __u64 ps1[32]; #define SET_FIELD(X,n,Y)\ ({\ - __u32 _n = (n);\ - (X = (X &~ (0x0f << ((7-(_n)) << 2))) | ((Y) << ((7-(_n)) << 2)));\ + __u32 m_n = (n);\ + (X = (X &~ (0x0f << ((7-(m_n)) << 2))) | ((Y) << ((7-(m_n)) << 2)));\ }) #define CLEAR_FIELD(X,n) (X = (X &~ (0x0f << ((7-(n)) << 2)))) #define GET_FIELD(X,n) ((X >> (32 - (((n) + 1) << 2))) & 0x0f) @@@@ -293,16 +293,16 @@@@ extern __u64 ps1[32]; // signed #define CALC_CR(n,X,Y)\ ({\ - __s32 _X = (X);\ - __s32 _Y = (Y);\ - SET_FIELD (CR, n, ((IS_XER_SO) ? CR_SO : 0) | ((_X < _Y) ? CR_LT : 0) | ((_X > _Y) ? CR_GT : 0) | ((_X == _Y) ? CR_EQ : 0));\ + __s32 m_X = (X);\ + __s32 m_Y = (Y);\ + SET_FIELD (CR, n, ((IS_XER_SO) ? CR_SO : 0) | ((m_X < m_Y) ? CR_LT : 0) | ((m_X > m_Y) ? CR_GT : 0) | ((m_X == m_Y) ? CR_EQ : 0));\ }) // unsigned #define CALC_CRL(n,X,Y)\ ({\ - __u32 _X = (X);\ - __u32 _Y = (Y);\ - SET_FIELD (CR, n, ((IS_XER_SO) ? CR_SO : 0) | ((_X < _Y) ? CR_LT : 0) | ((_X > _Y) ? CR_GT : 0) | ((_X == _Y) ? CR_EQ : 0));\ + __u32 m_X = (X);\ + __u32 m_Y = (Y);\ + SET_FIELD (CR, n, ((IS_XER_SO) ? CR_SO : 0) | ((m_X < m_Y) ? CR_LT : 0) | ((m_X > m_Y) ? CR_GT : 0) | ((m_X == m_Y) ? CR_EQ : 0));\ }) // rewrite in asm @@@@ -315,14 +315,14 @@@@ extern __u64 ps1[32]; #define IS_SNAN(X) ((((X) & 0x000fffffffffffffULL) != 0) && (((X) & 0x7ff8000000000000ULL) == 0x7ff0000000000000ULL)) #define CALC_CRF(n,X,Y)\ ({\ - double _X = (X);\ - double _Y = (Y);\ - if (_X < _Y)\ + double m_X = (X);\ + double m_Y = (Y);\ + if (m_X < m_Y)\ {\ SET_FIELD (CR, n, 8);\ FPSCR |= 8 << FPSCR_FPCC;\ }\ - else if (_X > _Y)\ + else if (m_X > m_Y)\ {\ SET_FIELD (CR, n, 4);\ FPSCR |= 4 << FPSCR_FPCC;\ @@@@ -337,8 +337,8 @@@@ extern __u64 ps1[32]; #define IS_NANS IS_NAN #define CALC_CRFS(n,Xf,Xb,Yf,Yb)\ ({\ - double _X = (Xf);\ - double _Y = (Yf);\ + double m_X = (Xf);\ + double m_Y = (Yf);\ FPSCR &= ~(0x1f << FPSCR_FPCC);\ if (IS_NAN (Xb) || IS_NAN (Yb))\ {\ @@@@ -346,12 +346,12 @@@@ extern __u64 ps1[32]; FPSCR |= 1 << FPSCR_FPCC;\ FPSCR |= FPSCR_VXSNAN;\ }\ - else if (_X < _Y)\ + else if (m_X < m_Y)\ {\ SET_FIELD (CR, n, 8);\ FPSCR |= 8 << FPSCR_FPCC;\ }\ - else if (_X > _Y)\ + else if (m_X > m_Y)\ {\ SET_FIELD (CR, n, 4);\ FPSCR |= 4 << FPSCR_FPCC;\ @@@@ -406,11 +406,11 @@@@ extern __u64 ps1[32]; #define GENMASK(X,Y)\ ({\ - __u32 _X = (X);\ - __u32 _Y = (Y);\ - ((_X <= _Y) ? \ - ((0xffffffff >> (_X)) ^ (((_Y) < 31)? (0xffffffff >> ((_Y) + 1)) : 0)) :\ - (~((0xffffffff >> (_X)) ^ (((_Y) < 31)? (0xffffffff >> ((_Y) + 1)) : 0)))) ;\ + __u32 m_X = (X);\ + __u32 m_Y = (Y);\ + ((m_X <= m_Y) ? \ + ((0xffffffff >> (m_X)) ^ (((m_Y) < 31)? (0xffffffff >> ((m_Y) + 1)) : 0)) :\ + (~((0xffffffff >> (m_X)) ^ (((m_Y) < 31)? (0xffffffff >> ((m_Y) + 1)) : 0)))) ;\ }) #define MASK(X,Y) (mask[X][Y]) @ 1.1 log @Added four patches that replace reserved identifiers with allowed ones. Fixes the build on NetBSD, which also defines the same identifiers, but is allowed to. @ text @d1 1 a1 1 $NetBSD$ @