From 60db7b9fe6f6a85bf24f023bb4a72a780d189c20 Mon Sep 17 00:00:00 2001
From: saxxonpike <saxxonpike@gmail.com>
Date: Sat, 17 Aug 2013 06:51:55 +0000
Subject: [PATCH] Commodore64: Marginal speedup from converting the rest of the
 uints to int. No noticeable accuracy difference.

---
 BizHawk.Emulation/Computers/Commodore64/C64.Input.cs      | 8 ++++----
 .../Commodore64/Experimental/Chips/Internals/Pla.cs       | 1 -
 BizHawk.Emulation/Computers/Commodore64/MOS/Chip23XX.cs   | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/BizHawk.Emulation/Computers/Commodore64/C64.Input.cs b/BizHawk.Emulation/Computers/Commodore64/C64.Input.cs
index 87f9ab4015..8abbd3f9a9 100644
--- a/BizHawk.Emulation/Computers/Commodore64/C64.Input.cs
+++ b/BizHawk.Emulation/Computers/Commodore64/C64.Input.cs
@@ -34,18 +34,18 @@ namespace BizHawk.Emulation.Computers.Commodore64
 		public void PollInput()
 		{
 			// scan joysticks
-			for (uint i = 0; i < 2; i++)
+			for (int i = 0; i < 2; i++)
 			{
-				for (uint j = 0; j < 5; j++)
+                for (int j = 0; j < 5; j++)
 				{
 					joystickPressed[i, j] = controller[joystickMatrix[i, j]];
 				}
 			}
 
 			// scan keyboard
-			for (uint i = 0; i < 8; i++)
+            for (int i = 0; i < 8; i++)
 			{
-				for (uint j = 0; j < 8; j++)
+                for (int j = 0; j < 8; j++)
 				{
 					keyboardPressed[i, j] = controller[keyboardMatrix[i, j]];
 				}
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Pla.cs b/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Pla.cs
index 33162892db..751010918a 100644
--- a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Pla.cs
+++ b/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Pla.cs
@@ -159,7 +159,6 @@ namespace BizHawk.Emulation.Computers.Commodore64.Experimental.Chips.Internals
                 p13 = hiram && charen && a15 && a14 && !a13 && a12 && !aec && ba && read && !exrom && !game;
                 p14 = hiram && charen && a15 && a14 && !a13 && a12 && !aec && !read && !exrom && !game;
                 p15 = loram && charen && a15 && a14 && !a13 && a12 && !aec && ba && read && !exrom && !game;
-                p15 = loram && charen && a15 && a14 && !a13 && a12 && !aec && ba && read && !exrom && !game;
                 p16 = loram && charen && a15 && a14 && !a13 && a12 && !aec && !read && !exrom && !game;
                 p17 = a15 && a14 && !a13 && a12 && !aec && ba && read && exrom && !game;
                 p18 = a15 && a14 && !a13 && a12 && !aec && !read && exrom && !game;
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/Chip23XX.cs b/BizHawk.Emulation/Computers/Commodore64/MOS/Chip23XX.cs
index 5bb2ee78f3..9371f814b7 100644
--- a/BizHawk.Emulation/Computers/Commodore64/MOS/Chip23XX.cs
+++ b/BizHawk.Emulation/Computers/Commodore64/MOS/Chip23XX.cs
@@ -16,7 +16,7 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
 
 	public class Chip23XX
 	{
-		private uint addrMask;
+		private int addrMask;
 		private byte[] rom;
 
 		public Chip23XX(Chip23XXmodel model, byte[] data)