Skip to contentSkip to conversation

display_buffer: fix misaligned buffer

PATCH New Reinhard Meyer 2 participants 2 messages Sep 8, 2010 – Sep 13, 2010 Library code

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 display_buffer: fix misaligned buffer

use a union to cause necessary alignment per architecture

---
 lib/display_options.c |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)
lib/display_options.c +15 -12
index 20319e6..d0480f5 100644
@@ -101,10 +101,12 @@ void print_size(unsigned long long size, const char *s)
 #define DEFAULT_LINE_LENGTH_BYTES (16)
 int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen)
 {
-	uint8_t linebuf[MAX_LINE_LENGTH_BYTES + 1];
-	uint32_t *uip = (void*)linebuf;
-	uint16_t *usp = (void*)linebuf;
-	uint8_t *ucp = (void*)linebuf;
+	/* linebuf as a union causes proper alignment */
+	union linebuf {
+		uint32_t ui[MAX_LINE_LENGTH_BYTES/sizeof(uint32_t) + 1];
+		uint16_t us[MAX_LINE_LENGTH_BYTES/sizeof(uint16_t) + 1];
+		uint8_t  uc[MAX_LINE_LENGTH_BYTES/sizeof(uint8_t) + 1];
+	} lb;
 	int i;
 
 	if (linelen*width > MAX_LINE_LENGTH_BYTES)
@@ -123,21 +125,22 @@ int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen)
 		for (i = 0; i < linelen; i++) {
 			uint32_t x;
 			if (width == 4)
-				x = uip[i] = *(volatile uint32_t *)data;
+				x = lb.ui[i] = *(volatile uint32_t *)data;
 			else if (width == 2)
-				x = usp[i] = *(volatile uint16_t *)data;
+				x = lb.us[i] = *(volatile uint16_t *)data;
 			else
-				x = ucp[i] = *(volatile uint8_t *)data;
+				x = lb.uc[i] = *(volatile uint8_t *)data;
 			printf(" %0*x", width * 2, x);
 			data += width;
 		}
 
 		/* Print data in ASCII characters */
-		for (i = 0; i < linelen * width; i++)
-			if (!isprint(ucp[i]) || ucp[i] >= 0x80)
-				ucp[i] = '.';
-		ucp[i] = '\0';
-		printf("    %s\n", ucp);
+		for (i = 0; i < linelen * width; i++) {
+			if (!isprint(lb.uc[i]) || lb.uc[i] >= 0x80)
+				lb.uc[i] = '.';
+		}
+		lb.uc[i] = '\0';
+		printf("    %s\n", lb.uc);
 
 		/* update references */
 		addr += linelen * width;
Signature · 1 line
1.5.6.5
#1 lore raw

PATCH v3 1/1 display_buffer: fix misaligned buffer

Dear Reinhard Meyer,

Quoted 6 lines · In message <[email protected]> you…

use a union to cause necessary alignment per architecture

---
 lib/display_options.c |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

Applied to master.

Also merged current master into "next" so this is fixed there, too.

Best regards,

Wolfgang Denk

Signature · 7 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
If a packet hits a pocket on a socket on a port,
And the bus is interrupted as a very last resort,
And the address of the memory makes your floppy disk abort,
Then the socket packet pocket has an error to report! - Ken Burchill?