From 04299c972f34a9283ad383ed006163791d5b102f Mon Sep 17 00:00:00 2001 From: Marc Chapman Date: Tue, 8 Aug 2017 01:39:01 +0100 Subject: [PATCH 1/2] rewrite swap, add xorswap --- Engine/lib/opcode/Ice/IceUtils.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Engine/lib/opcode/Ice/IceUtils.h b/Engine/lib/opcode/Ice/IceUtils.h index f4552ec90..e4cb2b42d 100644 --- a/Engine/lib/opcode/Ice/IceUtils.h +++ b/Engine/lib/opcode/Ice/IceUtils.h @@ -96,7 +96,8 @@ //! x ^= y; /* x' = (x^y) */ //! y ^= x; /* y' = (y^(x^y)) = x */ //! x ^= y; /* x' = (x^y)^x = y */ - inline_ void Swap(udword& x, udword& y) { x ^= y; y ^= x; x ^= y; } + inline_ void xorSwap(udword& x, udword& y) { x ^= y; y ^= x; x ^= y; } + inline_ void Swap(udword& x, udword& y) {int temp = x; x = y; y = temp; } //! Little/Big endian (from Steve Baker's Cute Code Collection) //! From 4d22ff589448a7be99f37a3aac9f56e9e6f073cb Mon Sep 17 00:00:00 2001 From: Marc Chapman Date: Thu, 10 Aug 2017 18:00:13 +0100 Subject: [PATCH 2/2] change int to udword --- Engine/lib/opcode/Ice/IceUtils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine/lib/opcode/Ice/IceUtils.h b/Engine/lib/opcode/Ice/IceUtils.h index e4cb2b42d..f397cca65 100644 --- a/Engine/lib/opcode/Ice/IceUtils.h +++ b/Engine/lib/opcode/Ice/IceUtils.h @@ -97,7 +97,7 @@ //! y ^= x; /* y' = (y^(x^y)) = x */ //! x ^= y; /* x' = (x^y)^x = y */ inline_ void xorSwap(udword& x, udword& y) { x ^= y; y ^= x; x ^= y; } - inline_ void Swap(udword& x, udword& y) {int temp = x; x = y; y = temp; } + inline_ void Swap(udword& x, udword& y) { udword temp = x; x = y; y = temp; } //! Little/Big endian (from Steve Baker's Cute Code Collection) //!