From 033620a4788d76fc6a73a348fee5f0551c3312ea Mon Sep 17 00:00:00 2001
From: pasky1382 <pasky1382@gmail.com>
Date: Mon, 20 Jan 2014 17:38:31 +0000
Subject: [PATCH] Cleanup and added byteswapping functions for lua.

---
 .../lua/EmuLuaLibrary.Bit.cs                  | 24 +++++++++++++++++++
 .../lua/EmuLuaLibrary.String.cs               | 11 +++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Bit.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Bit.cs
index 96ccc88470..049db9a121 100644
--- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Bit.cs
+++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Bit.cs
@@ -19,6 +19,9 @@ namespace BizHawk.Client.Common
 					"ror",
 					"rshift",
 					"check",
+					"byteswap_16",
+					"byteswap_32",
+					"byteswap_64",
 				};
 			}
 		}
@@ -70,5 +73,26 @@ namespace BizHawk.Client.Common
 			var value = Convert.ToInt64(LuaLong(num));
 			return (value & (1 << (int)(LuaInt(pos)))) != 0;
 		}
+
+		public static uint bit_byteswap_16(object short_)
+		{
+			 return (UInt16)((LuaInt(short_) & 0xFFU) << 8 | (LuaInt(short_) & 0xFF00U) >> 8);
+		}
+
+		public static uint bit_byteswap_32(object word_)
+		{
+			return (LuaUInt(word_) & 0x000000FFU) << 24 | (LuaUInt(word_) & 0x0000FF00U) << 8 |
+				(LuaUInt(word_) & 0x00FF0000U) >> 8 | (LuaUInt(word_) & 0xFF000000U) >> 24;
+		}
+
+		public static UInt64 bit_byteswap_64(object long_)
+		{
+			UInt64 value = (UInt64)LuaLong(long_);
+			return (value & 0x00000000000000FFUL) << 56 | (value & 0x000000000000FF00UL) << 40 |
+		 (value & 0x0000000000FF0000UL) << 24 | (value & 0x00000000FF000000UL) << 8 |
+		 (value & 0x000000FF00000000UL) >> 8 | (value & 0x0000FF0000000000UL) >> 24 |
+		 (value & 0x00FF000000000000UL) >> 40 | (value & 0xFF00000000000000UL) >> 56;
+		}
+
 	}
 }
diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.String.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.String.cs
index f3e8fcd722..c12ed98eca 100644
--- a/BizHawk.Client.Common/lua/EmuLuaLibrary.String.cs
+++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.String.cs
@@ -10,8 +10,9 @@ namespace BizHawk.Client.Common
 			{
 				return new[]
 				{
-					"hex",
 					"binary",
+					"hex",
+					"octal",
 					"trim",
 					"replace",
 					"toupper",
@@ -19,7 +20,6 @@ namespace BizHawk.Client.Common
 					"startswith",
 					"substring",
 					"contains",
-					
 					"endswith",
 				};
 			}
@@ -38,6 +38,13 @@ namespace BizHawk.Client.Common
 			return binary;
 		}
 
+		public static string string_octal(object num)
+		{
+			string octal = Convert.ToString(LuaLong(num),8);
+			if (octal.Length == 1) octal = "0" + octal;
+			return octal;
+		}
+
 		public static string string_trim(string str)
 		{
 			return str.Trim();