svn commit: r259668 - head/sys/cddl/dev/fbt

[Justin Hibbits]

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;
 	}