Module Name:    src
Committed By:   isaki
Date:           Sun Aug 10 13:29:10 UTC 2014

Modified Files:
        src/lib/libm/arch/m68k: s_ceil.S s_floor.S

Log Message:
Remove a meaningless conditional branch.
PR/49083 (1)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libm/arch/m68k/s_ceil.S \
    src/lib/libm/arch/m68k/s_floor.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libm/arch/m68k/s_ceil.S
diff -u src/lib/libm/arch/m68k/s_ceil.S:1.7 src/lib/libm/arch/m68k/s_ceil.S:1.8
--- src/lib/libm/arch/m68k/s_ceil.S:1.7	Thu Aug  7 16:44:40 2003
+++ src/lib/libm/arch/m68k/s_ceil.S	Sun Aug 10 13:29:10 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: s_ceil.S,v 1.7 2003/08/07 16:44:40 agc Exp $	*/
+/*	$NetBSD: s_ceil.S,v 1.8 2014/08/10 13:29:10 isaki Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -38,20 +38,14 @@
 ;_sccsid:
 ;.asciz	"from: @(#)floor.s	5.1 (Berkeley) 5/17/90"
 
-RCSID("$NetBSD: s_ceil.S,v 1.7 2003/08/07 16:44:40 agc Exp $")
+RCSID("$NetBSD: s_ceil.S,v 1.8 2014/08/10 13:29:10 isaki Exp $")
 
 | ceil(x)
-| -floor(-x), for all real x
 ENTRY(ceil)
 	fmovel	%fpcr,%d0	| save old FPCR
 	fmoved	%sp@(4),%fp0	| get argument
 	fbun	Lret		| if NaN, return NaN
-	fbolt	Lrtz		| <0, round to zero
-	fmovel	#0x30,%fpcr	| >=0, round to inf
-	jra	Ldoit
-Lrtz:
-	fmovel	#0x10,%fpcr
-Ldoit:
+	fmovel	#0x30,%fpcr	| round to +inf
 	fintd	%sp@(4),%fp0	| truncate
 	fmovel	%d0,%fpcr	| restore old FPCR
 Lret:
Index: src/lib/libm/arch/m68k/s_floor.S
diff -u src/lib/libm/arch/m68k/s_floor.S:1.7 src/lib/libm/arch/m68k/s_floor.S:1.8
--- src/lib/libm/arch/m68k/s_floor.S:1.7	Thu Aug  7 16:44:41 2003
+++ src/lib/libm/arch/m68k/s_floor.S	Sun Aug 10 13:29:10 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: s_floor.S,v 1.7 2003/08/07 16:44:41 agc Exp $	*/
+/*	$NetBSD: s_floor.S,v 1.8 2014/08/10 13:29:10 isaki Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,7 @@
 ;_sccsid:
 ;.asciz	"from: @(#)floor.s	5.1 (Berkeley) 5/17/90"
 
-RCSID("$NetBSD: s_floor.S,v 1.7 2003/08/07 16:44:41 agc Exp $")
+RCSID("$NetBSD: s_floor.S,v 1.8 2014/08/10 13:29:10 isaki Exp $")
 
 | floor(x)
 | the largest integer no larger than x
@@ -46,12 +46,7 @@ ENTRY(floor)
 	fmovel	%fpcr,%d0	| save old FPCR
 	fmoved	%sp@(4),%fp0	| get argument
 	fbun	Lret		| if NaN, return NaN
-	fboge	Lrtz		| >=0, round to zero
-	fmovel	#0x20,%fpcr	| <0, round to -inf
-	jra	Ldoit
-Lrtz:
-	fmovel	#0x10,%fpcr
-Ldoit:
+	fmovel	#0x20,%fpcr	| round to -inf
 	fintd	%sp@(4),%fp0	| truncate
 	fmovel	%d0,%fpcr	| restore old FPCR
 Lret:

Reply via email to