Date: Wed, 1 Sep 2010 15:24:47 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r212098 - head/sys/boot/pc98/boot2 Message-ID: <201009011524.o81FOlSm069493@svn.freebsd.org>
index | next in thread | raw e-mail
Author: dim Date: Wed Sep 1 15:24:47 2010 New Revision: 212098 URL: http://svn.freebsd.org/changeset/base/212098 Log: Use a cleaner expression to retrieve the memory size in pc98's boot2.c, which also avoids NULL pointer arithmetic, as suggested by jhb. The available space goes from 11 bytes to 7. Reviewed by: nyan Approved by: rpaulo (mentor) Modified: head/sys/boot/pc98/boot2/boot2.c Modified: head/sys/boot/pc98/boot2/boot2.c ============================================================================== --- head/sys/boot/pc98/boot2/boot2.c Wed Sep 1 14:31:05 2010 (r212097) +++ head/sys/boot/pc98/boot2/boot2.c Wed Sep 1 15:24:47 2010 (r212098) @@ -187,9 +187,8 @@ xfsread(ino_t inode, void *buf, size_t n static inline uint32_t memsize(void) { - u_char *p = (u_char *)PTOV(0x401); - - return *p * 128 * 1024 + *(u_int16_t *)(p + (0x594 - 0x401)) * 1024 * 1024; + return (*(u_char *)PTOV(0x401) * 128 * 1024 + + *(uint16_t *)PTOV(0x594) * 1024 * 1024); } static inline voidhelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009011524.o81FOlSm069493>