From: zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Wed, 6 May 2009 23:05:57 +0000 (+0000)
Subject: Fix pointer cast alignment issues in svf.c
X-Git-Tag: v0.2.0~883
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8cbb2ae7f48ab0c80b7ab644c01fb49e75a6959e;p=openocd

Fix pointer cast alignment issues in svf.c

git-svn-id: svn://svn.berlios.de/openocd/trunk@1622 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---

diff --git a/src/svf/svf.c b/src/svf/svf.c
index 00e88361..c94461ca 100644
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -653,11 +653,17 @@ static int svf_check_tdo(void)
 			{
 				if ((svf_tdi_buffer[index + j] & svf_mask_buffer[index + j]) != svf_tdo_buffer[index + j])
 				{
-					LOG_ERROR("tdo check error at line %d, read = 0x%X, want = 0x%X, mask = 0x%X",
+					unsigned bitmask = (1 << svf_check_tdo_para[i].bit_len) - 1;
+					unsigned received, expected, tapmask;
+					memcpy(&received, svf_tdi_buffer + index, sizeof(unsigned));
+					memcpy(&expected, svf_tdo_buffer + index, sizeof(unsigned));
+					memcpy(&tapmask, svf_mask_buffer + index, sizeof(unsigned));
+					LOG_ERROR("tdo check error at line %d, "
+						"read = 0x%X, want = 0x%X, mask = 0x%X",
 								svf_check_tdo_para[i].line_num,
-								(*(int*)(svf_tdi_buffer + index)) & ((1 << svf_check_tdo_para[i].bit_len) - 1),
-								(*(int*)(svf_tdo_buffer + index)) & ((1 << svf_check_tdo_para[i].bit_len) - 1),
-								(*(int*)(svf_mask_buffer + index)) & ((1 << svf_check_tdo_para[i].bit_len) - 1));
+								received & bitmask,
+								expected & bitmask,
+								tapmask & bitmask);
 					return ERROR_FAIL;
 				}
 			}
@@ -1381,8 +1387,11 @@ static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
 			// output debug info
 			if ((SIR == command) || (SDR == command))
 			{
+				int read_value;
+				memcpy(&read_value, svf_tdi_buffer, sizeof(int));
 				// in debug mode, data is from index 0
-				LOG_DEBUG("\tTDO read = 0x%X", (*(int*)svf_tdi_buffer) & ((1 << (svf_check_tdo_para[0].bit_len)) - 1));
+				int read_mask = (1 << (svf_check_tdo_para[0].bit_len)) - 1;
+				LOG_DEBUG("\tTDO read = 0x%X", read_value & read_mask);
 			}
 		}
 	}