Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 18 Apr 2006 20:56:21 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 95532 for review
Message-ID:  <200604182056.k3IKuL59082719@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help 
http://perforce.freebsd.org/chv.cgi?CH=95532

Change 95532 by imp@imp_Speedy on 2006/04/18 20:55:29

	another sensible interface choice saves 200ish bytes

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#4 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/loader_prompt.c#4 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/p_string.c#3 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/p_string.h#3 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#4 (text+ko) ====

@@ -2,7 +2,7 @@
 
 CFLAGS=-O2 -mcpu=arm9 -ffreestanding \
 	-I${.CURDIR}/../libat91 \
-	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
+	-Wall -Waggregate-return -Wcast-align \
 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
 	-Werror

==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/loader_prompt.c#4 (text+ko) ====

@@ -72,20 +72,10 @@
 static unsigned
 BuildIP(void)
 {
-	unsigned	p_ip_addr;
-
-	p_ip_addr = p_ASCIIToDec(argv[1]);
-	p_ip_addr <<= 8;
-
-	p_ip_addr |= p_ASCIIToDec(argv[2]);
-	p_ip_addr <<= 8;
-
-	p_ip_addr |= p_ASCIIToDec(argv[3]);
-	p_ip_addr <<= 8;
-
-	p_ip_addr |= p_ASCIIToDec(argv[4]);
-
-	return (p_ip_addr);
+	return ((p_ASCIIToDec(argv[1]) << 24) |
+	    (p_ASCIIToDec(argv[2]) << 16) |
+	    (p_ASCIIToDec(argv[3]) << 8) |
+	    p_ASCIIToDec(argv[4]));
 }
 
 
@@ -193,14 +183,12 @@
 	// copy memory
 
 		char		*to, *from;
-		unsigned	toarg, fromarg, size;
+		unsigned	size;
 
 		if (argc > 3) {
-			p_ASCIIToHex(argv[1], &toarg);
-			p_ASCIIToHex(argv[2], &fromarg);
-			p_ASCIIToHex(argv[3], &size);
-			to = (char *)toarg;
-			from = (char *)fromarg;
+			to = (char *)p_ASCIIToHex(argv[1]);
+			from = (char *)p_ASCIIToHex(argv[2]);
+			size = p_ASCIIToHex(argv[3]);
 			p_memcpy(to, from, size);
 		}
 
@@ -218,12 +206,11 @@
 	// execute at address
 
 		void (*execAddr)(unsigned, unsigned, unsigned);
-		unsigned addr;
 
 		if (argc > 1) {
-			p_ASCIIToHex(argv[1], &addr);
 			/* in future, include machtypes (MACH_KB9200 = 612) */
-			execAddr = (void (*)(unsigned, unsigned, unsigned))addr;
+			execAddr = (void (*)(unsigned, unsigned, unsigned))
+			  p_ASCIIToHex(argv[1]);
 			(*execAddr)(0, 612, tagAddress);
 		}
 
@@ -238,7 +225,7 @@
 		unsigned address = 0;
 
 		if (argc > 2)
-			p_ASCIIToHex(argv[1], &address);
+			address = p_ASCIIToHex(argv[1]);
 
 		TFTP_Download(address, argv[2]);
 
@@ -282,30 +269,17 @@
 	// "m <mac address 12 34 56 78 9a bc>
 	// set mac address using 6 byte values
 
-		unsigned	u_value, low_addr, high_addr;
+		unsigned	low_addr, high_addr;
 
 		if (argc > 6) {
 
-			p_ASCIIToHex(argv[4], &low_addr);
-			low_addr <<= 8;
-
-			p_ASCIIToHex(argv[3], &u_value);
-			low_addr |= u_value;
-			low_addr <<= 8;
-
-			p_ASCIIToHex(argv[2], &u_value);
-			low_addr |= u_value;
-			low_addr <<= 8;
-
-			p_ASCIIToHex(argv[1], &u_value);
-			low_addr |= u_value;
-
-			p_ASCIIToHex(argv[6], &high_addr);
-			high_addr <<= 8;
-
-			p_ASCIIToHex(argv[5], &u_value);
-			high_addr |= u_value;
-
+			low_addr = (p_ASCIIToHex(argv[4]) << 24) |
+			    (p_ASCIIToHex(argv[3]) << 16) |
+			    (p_ASCIIToHex(argv[2]) << 8) |
+			    p_ASCIIToHex(argv[1]);
+			high_addr = 
+			    (p_ASCIIToHex(argv[6]) << 8) |
+			    p_ASCIIToHex(argv[5]);
 			SetMACAddress(low_addr, high_addr);
 		}
 
@@ -321,7 +295,7 @@
 
 		if (argc > 1) {
 			RestoreSpace(2);
-			p_ASCIIToHex(argv[1], &index);
+			index = p_ASCIIToHex(argv[1]);
 			SetBootCommand(index, argv[2]);
 		}
 
@@ -336,7 +310,7 @@
 
 		if (argc > 2) {
 			RestoreSpace(2);
-			p_ASCIIToHex(argv[1], &tagAddress);
+			tagAddress = p_ASCIIToHex(argv[1]);
 			InitTagList(argv[2], (void*)tagAddress);
 		}
 
@@ -356,11 +330,9 @@
 	// download X-modem record at address
 
 		char		*destAddr = 0;
-		unsigned	addr;
 
 		if (argc > 1) {
-			p_ASCIIToHex(argv[1], &addr);
-			destAddr = (char *)addr;
+			destAddr = (char *)p_ASCIIToHex(argv[1]);
 			xmodem_rx(destAddr);
 		}
 	}

==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/p_string.c#3 (text+ko) ====

@@ -110,15 +110,15 @@
 
 /*
  * .KB_C_FN_DEFINITION_START
- * void p_ASCIIToHex(char *, unsigned *)
+ * unsigned p_ASCIIToHex(char *)
  *  This global function set the unsigned value equal to the converted
  * hex number passed as a string.  No error checking is performed; the
  * string must be valid hex value, point at the start of string, and be
  * NULL-terminated.
  * .KB_C_FN_DEFINITION_END
  */
-void
-p_ASCIIToHex(const char *buf, unsigned *value)
+unsigned
+p_ASCIIToHex(const char *buf)
 {
 	unsigned	lValue = 0;
 
@@ -129,14 +129,13 @@
 		lValue <<= 4;
 		lValue += p_HexCharValue(*buf++);
 	}
-
-	*value = lValue;
+	return (lValue);
 }
 
 
 /*
  * .KB_C_FN_DEFINITION_START
- * void p_ASCIIToDec(char *, unsigned *)
+ * unsigned p_ASCIIToDec(char *)
  *  This global function set the unsigned value equal to the converted
  * decimal number passed as a string.  No error checking is performed; the
  * string must be valid decimal value, point at the start of string, and be

==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/p_string.h#3 (text+ko) ====

@@ -28,7 +28,7 @@
 void p_memset(char *buffer, char value, int size);
 int p_strlen(const char *buffer);
 char *p_strcpy(char *to, const char *from);
-void p_ASCIIToHex(const char *buf, unsigned *value);
+unsigned p_ASCIIToHex(const char *buf);
 unsigned p_ASCIIToDec(const char *buf);
 void p_memcpy(char *to, const char *from, unsigned size);
 int p_memcmp(const char *to, const char *from, unsigned size);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604182056.k3IKuL59082719>