[Openocd-svn] r1622 - trunk/src/svf

[<zw...@ma...>]

Author: zwelch
Date: 2009-05-07 01:05:57 +0200 (Thu, 07 May 2009)
New Revision: 1622

Modified:
   trunk/src/svf/svf.c
Log:
Fix pointer cast alignment issues in svf.c

Modified: trunk/src/svf/svf.c
===================================================================
--- trunk/src/svf/svf.c	2009-05-06 21:48:39 UTC (rev 1621)
+++ trunk/src/svf/svf.c	2009-05-06 23:05:57 UTC (rev 1622)
@@ -653,11 +653,17 @@
 			{
 				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 @@
 			// 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);
 			}
 		}
 	}