From owner-svn-src-head@FreeBSD.ORG  Fri Dec 20 23:18:15 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4795AD8F;
 Fri, 20 Dec 2013 23:18:15 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 332EC1337;
 Fri, 20 Dec 2013 23:18:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKNIFPm097431;
 Fri, 20 Dec 2013 23:18:15 GMT
 (envelope-from jhibbits@svn.freebsd.org)
Received: (from jhibbits@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKNIFbS097430;
 Fri, 20 Dec 2013 23:18:15 GMT
 (envelope-from jhibbits@svn.freebsd.org)
Message-Id: <201312202318.rBKNIFbS097430@svn.freebsd.org>
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Fri, 20 Dec 2013 23:18:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259668 - head/sys/cddl/dev/fbt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Dec 2013 23:18:15 -0000

Author: jhibbits
Date: Fri Dec 20 23:18:14 2013
New Revision: 259668
URL: http://svnweb.freebsd.org/changeset/base/259668

Log:
  Fix a couple bugs in FBT PowerPC.  Clamp the size to a 'instruction size' not
  'byte size', and fix a typo.
  
  MFC after:	2 weeks

Modified:
  head/sys/cddl/dev/fbt/fbt_powerpc.c

Modified: head/sys/cddl/dev/fbt/fbt_powerpc.c
==============================================================================
--- head/sys/cddl/dev/fbt/fbt_powerpc.c	Fri Dec 20 21:31:50 2013	(r259667)
+++ head/sys/cddl/dev/fbt/fbt_powerpc.c	Fri Dec 20 23:18:14 2013	(r259668)
@@ -219,7 +219,7 @@ fbt_provide_module_function(linker_file_
 		return (0);
 
 	instr = (u_int32_t *) symval->value;
-	limit = (u_int32_t *) (symval->value + symval->size);
+	limit = (u_int32_t *) (symval->value + symval->size / sizeof(u_int32_t));
 
 	for (; instr < limit; instr++)
 		if (*instr == FBT_MFLR_R0)
@@ -278,7 +278,7 @@ again:
 	instr++;
 
 	for (j = 0; j < 12 && instr < limit; j++, instr++) {
-		if ((*instr == FBT_BCTR) || (*instr == FBT_BLR) |
+		if ((*instr == FBT_BCTR) || (*instr == FBT_BLR) ||
 		    FBT_IS_JUMP(*instr))
 			break;
 	}