From 17e8625ffa1295ef77be3a28a38ac3f1a247a6bc Mon Sep 17 00:00:00 2001
From: Toni Wilen <twilen@winuae.net>
Date: Sun, 11 Jan 2015 14:30:06 +0200
Subject: [PATCH] Long size memory watch point value check fix.

---
 debug.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debug.cpp b/debug.cpp
index 6de6ba52..14d32f05 100644
--- a/debug.cpp
+++ b/debug.cpp
@@ -2120,7 +2120,7 @@ static int memwatch_func (uaecptr addr, int rwi, int size, uae_u32 *valp, uae_u3
 
 		if (!m->frozen && m->val_enabled) {
 			int trigger = 0;
-			uae_u32 mask = (1 << (m->size * 8)) - 1;
+			uae_u32 mask = m->size == 4 ? 0xffffffff : (1 << (m->size * 8)) - 1;
 			uae_u32 mval = m->val;
 			int scnt = size;
 			for (;;) {
@@ -2136,6 +2136,8 @@ static int memwatch_func (uaecptr addr, int rwi, int size, uae_u32 *valp, uae_u3
 					mask <<= 16;
 					scnt -= 2;
 					mval <<= 16;
+				} else {
+					scnt -= 4;
 				}
 				if (scnt <= 0)
 					break;
-- 
2.47.3