diff options
-rw-r--r-- | sys/arch/hppa/spmath/cnv_float.h | 3 | ||||
-rw-r--r-- | sys/arch/hppa/spmath/dfadd.c | 4 | ||||
-rw-r--r-- | sys/arch/hppa/spmath/dfcmp.c | 8 | ||||
-rw-r--r-- | sys/arch/hppa/spmath/dfsub.c | 4 | ||||
-rw-r--r-- | sys/arch/hppa/spmath/divu.S | 10 | ||||
-rw-r--r-- | sys/arch/hppa/spmath/float.h | 3 | ||||
-rw-r--r-- | sys/arch/hppa/spmath/fpbits.h | 3 | ||||
-rw-r--r-- | sys/arch/hppa/spmath/frnd.c | 3 | ||||
-rw-r--r-- | sys/arch/hppa/spmath/impys.S | 30 | ||||
-rw-r--r-- | sys/arch/hppa/spmath/impyu.S | 32 | ||||
-rw-r--r-- | sys/arch/hppa/spmath/setovfl.c | 8 | ||||
-rw-r--r-- | sys/arch/hppa/spmath/sfcmp.c | 4 | ||||
-rw-r--r-- | sys/arch/hppa/spmath/sgl_float.h | 3 |
13 files changed, 55 insertions, 60 deletions
diff --git a/sys/arch/hppa/spmath/cnv_float.h b/sys/arch/hppa/spmath/cnv_float.h index 0c37652daaa..561e257246f 100644 --- a/sys/arch/hppa/spmath/cnv_float.h +++ b/sys/arch/hppa/spmath/cnv_float.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cnv_float.h,v 1.7 2002/05/07 22:19:30 mickey Exp $ */ +/* $OpenBSD: cnv_float.h,v 1.8 2002/09/20 19:26:59 mickey Exp $ */ /* (c) Copyright 1986 HEWLETT-PACKARD COMPANY To anyone who acknowledges that this file is provided "AS IS" @@ -310,4 +310,3 @@ int sgl_to_sgl_fcnvxf(int *, sgl_floating_point *, unsigned int *); int sgl_to_dbl_fcnvxf(int *, dbl_floating_point *, unsigned int *); int dbl_to_sgl_fcnvxf(dbl_integer *, sgl_floating_point *, unsigned int *); int dbl_to_dbl_fcnvxf(dbl_integer *, dbl_floating_point *, unsigned int *); - diff --git a/sys/arch/hppa/spmath/dfadd.c b/sys/arch/hppa/spmath/dfadd.c index 6b175e1f0be..a5d75c88ec4 100644 --- a/sys/arch/hppa/spmath/dfadd.c +++ b/sys/arch/hppa/spmath/dfadd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dfadd.c,v 1.5 2002/05/07 22:19:30 mickey Exp $ */ +/* $OpenBSD: dfadd.c,v 1.6 2002/09/20 19:26:59 mickey Exp $ */ /* (c) Copyright 1986 HEWLETT-PACKARD COMPANY To anyone who acknowledges that this file is provided "AS IS" @@ -499,4 +499,4 @@ dbl_fadd(leftptr, rightptr, dstptr, status) Set_inexactflag(); } return(NOEXCEPTION); - } +} diff --git a/sys/arch/hppa/spmath/dfcmp.c b/sys/arch/hppa/spmath/dfcmp.c index c5ae72bd936..7416fc7aa62 100644 --- a/sys/arch/hppa/spmath/dfcmp.c +++ b/sys/arch/hppa/spmath/dfcmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dfcmp.c,v 1.5 2002/05/07 22:19:30 mickey Exp $ */ +/* $OpenBSD: dfcmp.c,v 1.6 2002/09/20 19:26:59 mickey Exp $ */ /* (c) Copyright 1986 HEWLETT-PACKARD COMPANY To anyone who acknowledges that this file is provided "AS IS" @@ -126,8 +126,8 @@ dbl_fcmp(leftptr, rightptr, cond, status) else { /* Negative compare. Signed or unsigned compares - * both work the same. That distinction is only - * important when the sign bits differ. */ + * both work the same. That distinction is only + * important when the sign bits differ. */ if( Dbl_allp1(leftp1) > Dbl_allp1(rightp1) ) { Set_status_cbit(Lessthan(cond)); @@ -151,4 +151,4 @@ dbl_fcmp(leftptr, rightptr, cond, status) } } return(NOEXCEPTION); - } +} diff --git a/sys/arch/hppa/spmath/dfsub.c b/sys/arch/hppa/spmath/dfsub.c index 848cf855de6..9856cb34472 100644 --- a/sys/arch/hppa/spmath/dfsub.c +++ b/sys/arch/hppa/spmath/dfsub.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dfsub.c,v 1.5 2002/05/07 22:19:30 mickey Exp $ */ +/* $OpenBSD: dfsub.c,v 1.6 2002/09/20 19:26:59 mickey Exp $ */ /* (c) Copyright 1986 HEWLETT-PACKARD COMPANY To anyone who acknowledges that this file is provided "AS IS" @@ -497,4 +497,4 @@ dbl_fsub(leftptr, rightptr, dstptr, status) Set_inexactflag(); } return(NOEXCEPTION); - } +} diff --git a/sys/arch/hppa/spmath/divu.S b/sys/arch/hppa/spmath/divu.S index 0a8f443113e..666eb9a6d87 100644 --- a/sys/arch/hppa/spmath/divu.S +++ b/sys/arch/hppa/spmath/divu.S @@ -1,4 +1,4 @@ -/* $OpenBSD: divu.S,v 1.7 2002/05/07 22:19:30 mickey Exp $ */ +/* $OpenBSD: divu.S,v 1.8 2002/09/20 19:26:59 mickey Exp $ */ /* (c) Copyright 1986 HEWLETT-PACKARD COMPANY To anyone who acknowledges that this file is provided "AS IS" @@ -17,7 +17,7 @@ #include <machine/asm.h> ;************************************************************************ -; Implement an integer divide routine for 32-bit operands and 32-bit quotient +; Implement an integer divide routine for 32-bit operands and 32-bit quotient ; and remainder with operand values of zero (divisor only) treated specially. ; ;**************************************************************************** @@ -120,9 +120,9 @@ LEAF_ENTRY(divu) ; ; end of divide routine ; -finish stws rem,0(arg3) ; save remainder in high part +finish stws rem,0(arg3) ; save remainder in high part ; of result - stws quo,4(arg3) ; save quotient in low part + stws quo,4(arg3) ; save quotient in low part ; of result ldws,mb -4(sp),tp ; restore registers ldws,mb -4(sp),dvr ; restore registers @@ -142,7 +142,7 @@ nosub addi 0,0,0 ; otherwise clear carry addib,> -1,tp,loop ; inc. counter; finished? addc quo,quo,quo ; shift bit of result into dvdl b finish+4 ; finish up - stws rem,0(arg3) ; save remainder in high part + stws rem,0(arg3) ; save remainder in high part ; of result EXIT(divu) diff --git a/sys/arch/hppa/spmath/float.h b/sys/arch/hppa/spmath/float.h index 700cbe05253..1039eb8fe72 100644 --- a/sys/arch/hppa/spmath/float.h +++ b/sys/arch/hppa/spmath/float.h @@ -1,4 +1,4 @@ -/* $OpenBSD: float.h,v 1.5 2002/05/07 22:19:30 mickey Exp $ */ +/* $OpenBSD: float.h,v 1.6 2002/09/20 19:26:59 mickey Exp $ */ /* (c) Copyright 1986 HEWLETT-PACKARD COMPANY To anyone who acknowledges that this file is provided "AS IS" @@ -470,4 +470,3 @@ typedef struct dint dbl_integer; #define Ext_negate(extent) \ (int )Extall(extent) = 0 - (int )Extall(extent) #define Ext_setone_low(extent) Bitfield_deposit(1,31,1,extent) - diff --git a/sys/arch/hppa/spmath/fpbits.h b/sys/arch/hppa/spmath/fpbits.h index 739035d0671..4c17dbcb7bf 100644 --- a/sys/arch/hppa/spmath/fpbits.h +++ b/sys/arch/hppa/spmath/fpbits.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fpbits.h,v 1.5 2002/05/07 22:19:30 mickey Exp $ */ +/* $OpenBSD: fpbits.h,v 1.6 2002/09/20 19:26:59 mickey Exp $ */ /* (c) Copyright 1986 HEWLETT-PACKARD COMPANY To anyone who acknowledges that this file is provided "AS IS" @@ -53,4 +53,3 @@ #define Bitfield_deposit(value,start,len,object) object = \ ((object) & ~(((unsigned)-1 >> (HOSTWDSZ-(len))) << (HOSTWDSZ-(start)-(len)))) | \ (((value) & ((unsigned)-1 >> (HOSTWDSZ-(len)))) << (HOSTWDSZ-(start)-(len))) - diff --git a/sys/arch/hppa/spmath/frnd.c b/sys/arch/hppa/spmath/frnd.c index 2bada11d1b8..188c476e438 100644 --- a/sys/arch/hppa/spmath/frnd.c +++ b/sys/arch/hppa/spmath/frnd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frnd.c,v 1.6 2002/05/07 22:19:30 mickey Exp $ */ +/* $OpenBSD: frnd.c,v 1.7 2002/09/20 19:26:59 mickey Exp $ */ /* (c) Copyright 1986 HEWLETT-PACKARD COMPANY To anyone who acknowledges that this file is provided "AS IS" @@ -237,4 +237,3 @@ quad_frnd(srcptr,dstptr,status) { return(UNIMPLEMENTEDEXCEPTION); } - diff --git a/sys/arch/hppa/spmath/impys.S b/sys/arch/hppa/spmath/impys.S index 10ba5f98a1d..25f07c6f54e 100644 --- a/sys/arch/hppa/spmath/impys.S +++ b/sys/arch/hppa/spmath/impys.S @@ -1,4 +1,4 @@ -/* $OpenBSD: impys.S,v 1.7 2002/05/07 22:19:30 mickey Exp $ */ +/* $OpenBSD: impys.S,v 1.8 2002/09/20 19:26:59 mickey Exp $ */ /* (c) Copyright 1986 HEWLETT-PACKARD COMPANY To anyone who acknowledges that this file is provided "AS IS" @@ -18,11 +18,11 @@ ;**************************************************************************** ; -;Implement an integer multiply routine for 32-bit operands and 64-bit product +;Implement an integer multiply routine for 32-bit operands and 64-bit product ;with operand values of zero (multiplicand only) and -2**31 treated specially. ;The algorithm uses the absolute value of the multiplier, four bits at a time, ;from right to left, to generate partial product. Execution speed is more -;important than program size in this implementation. +;important than program size in this implementation. ; ;**************************************************************************** ; @@ -64,14 +64,14 @@ mpy1 comb,< op1,gr0,mpya ; br. if multiplicand < 0 addib,= 0,op1,fini0 ; op1 = 0, product = 0 mpy2 addi 1,gr0,pc ; initialize pc to 00...01 movib,tr 8,cnt,mloop ; set count for mpy loop - extru op2,31,4,brindex ; 4 bits as index into table + extru op2,31,4,brindex ; 4 bits as index into table ; .align 8 ; b sh4c ; br. if sign overflow sh4n shd pu,pl,4,pl ; shift product right 4 bits addib,<= -1,cnt,mulend ; reduce count by 1, exit if - extru pu,27,28,pu ; <= zero + extru pu,27,28,pu ; <= zero ; mloop blr brindex,gr0 ; br. into table ; entries of 2 words @@ -94,13 +94,13 @@ mtable ; two words per entry ; ; ---- bits = 0010 ---- add op1, add op1, then shift 4 bits ; - addb,tr op1,pu,sh4n ; add 2*op1, to shift - addb,uv op1,pu,sh4c ; product right 4 bits + addb,tr op1,pu,sh4n ; add 2*op1, to shift + addb,uv op1,pu,sh4c ; product right 4 bits ; ; ---- bits = 0011 ---- add op1, add 2*op1, shift 4 bits ; - addb,tr op1,pu,sh4n-4 ; add op1 & 2*op1, shift - sh1add,nsv op1,pu,pu ; product right 4 bits + addb,tr op1,pu,sh4n-4 ; add op1 & 2*op1, shift + sh1add,nsv op1,pu,pu ; product right 4 bits ; ; ---- bits = 0100 ---- shift 2, add op1, shift 2 ; @@ -183,21 +183,21 @@ sh4c addib,> -1,cnt,mloop ; decrement count, loop if > 0 mpyb add,= op2,op2,gr0 ; if <> 0, back to main sect. b mpy1 sub 0,op2,op2 ; op2 = |multiplier| - add,>= op1,gr0,gr0 ; if op1 < 0, invert sign, + add,>= op1,gr0,gr0 ; if op1 < 0, invert sign, xor pm,sign,sign ; for correct result ; ; special case for multiplier = -2**31, op1 = signed multiplicand ; or multiplicand = -2**31, op1 = signed multiplier ; shd op1,0,1,pl ; shift op1 left 31 bits -mmax extrs op1,30,31,pu +mmax extrs op1,30,31,pu b signs ; negate product (if needed) bb,>=,n sign,0,fini ; test sign of product ; mpya add,= op1,op1,gr0 ; op1 = -2**31, special case b mpy2 sub 0,op1,op1 ; op1 = |multiplicand| - add,>= op2,gr0,gr0 ; if op2 < 0, invert sign, + add,>= op2,gr0,gr0 ; if op2 < 0, invert sign, xor pm,sign,sign ; for correct result movb,tr op2,op1,mmax ; use op2 as multiplicand shd op1,0,1,pl ; shift it left 31 bits @@ -228,8 +228,8 @@ sh1 addib,> -1,cnt,mloop ; loop if count > 0 sh2ns addib,tr 1,brindex,sh2sb+4 ; increment index extru pu,29,30,pu ; shift unsigned ; -sh2s shd pu,pl,2,pl ; shift with minus sign - shd pm,pu,2,pu ; +sh2s shd pu,pl,2,pl ; shift with minus sign + shd pm,pu,2,pu ; sub pu,op1,pu ; subtract op1 shd pu,pl,2,pl ; shift with minus sign addib,tr -1,cnt,mloop ; decrement count, loop @@ -255,7 +255,7 @@ sh2us extru pu,29,30,pu ; shift 2 unsigned addb,tr op1,pu,sh2a ; add op1 shd pu,pl,2,pl ; shift 2 bits ; -sh2c shd pu,pl,2,pl +sh2c shd pu,pl,2,pl shd pc,pu,2,pu ; shift with carry addb,tr op1,pu,sh2a ; add op1 to product shd pu,pl,2,pl ; br. to sh2 to shift pu diff --git a/sys/arch/hppa/spmath/impyu.S b/sys/arch/hppa/spmath/impyu.S index 89475dadf45..2355181e813 100644 --- a/sys/arch/hppa/spmath/impyu.S +++ b/sys/arch/hppa/spmath/impyu.S @@ -1,4 +1,4 @@ -/* $OpenBSD: impyu.S,v 1.7 2002/05/07 22:19:30 mickey Exp $ */ +/* $OpenBSD: impyu.S,v 1.8 2002/09/20 19:26:59 mickey Exp $ */ /* (c) Copyright 1986 HEWLETT-PACKARD COMPANY To anyone who acknowledges that this file is provided "AS IS" @@ -18,11 +18,11 @@ ;**************************************************************************** ; -;Implement an integer multiply routine for 32-bit operands and 64-bit product +;Implement an integer multiply routine for 32-bit operands and 64-bit product ; with operand values of zero (multiplicand only) and 2**32reated specially. ; The algorithm uses the multiplier, four bits at a time, from right to left, ; to generate partial product. Execution speed is more important than program -; size in this implementation. +; size in this implementation. ; ;****************************************************************************** ; @@ -35,7 +35,7 @@ op2 .equ 4 ; multiplier op1 .equ 5 ; multiplicand cnt .equ 6 ; count in multiply brindex .equ 7 ; index into the br. table -saveop2 .equ 8 ; save op2 if high bit of multiplicand +saveop2 .equ 8 ; save op2 if high bit of multiplicand ; is set pc .equ 9 ; carry bit of product, = 00...01 pm .equ 10 ; value of -1 used in shifting @@ -69,20 +69,20 @@ LEAF_ENTRY(impyu) b mpy1 ; if op1 < 2**32, start multiply add op2,gr0,saveop2 ; save op2 in saveop2 shd gr0,op2,1,pu ; shift op2 left 31 for result - b fini ; go to finish + b fini ; go to finish shd op2,gr0,1,pl ; -mpy1 addi -1,gr0,pm ; initialize pm to 111...1 +mpy1 addi -1,gr0,pm ; initialize pm to 111...1 addi 1,gr0,pc ; initialize pc to 00...01 movib,tr 8,cnt,mloop ; set count for mpy loop - extru op2,31,4,brindex ; 4 bits as index into table + extru op2,31,4,brindex ; 4 bits as index into table ; .align 8 ; b sh4c ; br. if sign overflow sh4n shd pu,pl,4,pl ; shift product right 4 bits addib,<= -1,cnt,mulend ; reduce count by 1, exit if - extru pu,27,28,pu ; <= zero + extru pu,27,28,pu ; <= zero ; mloop blr brindex,gr0 ; br. into table ; entries of 2 words @@ -105,13 +105,13 @@ mtable ; two words per entry ; ; ---- bits = 0010 ---- add op1, add op1, then shift 4 bits ; - addb,tr op1,pu,sh4n ; add 2*op1, to shift - addb,uv op1,pu,sh4c ; product right 4 bits + addb,tr op1,pu,sh4n ; add 2*op1, to shift + addb,uv op1,pu,sh4c ; product right 4 bits ; ; ---- bits = 0011 ---- add op1, add 2*op1, shift 4 bits ; - addb,tr op1,pu,sh4n-4 ; add op1 & 2*op1, shift - sh1add,nuv op1,pu,pu ; product right 4 bits + addb,tr op1,pu,sh4n-4 ; add op1 & 2*op1, shift + sh1add,nuv op1,pu,pu ; product right 4 bits ; ; ---- bits = 0100 ---- shift 2, add op1, shift 2 ; @@ -219,8 +219,8 @@ sh1 addib,> -1,cnt,mloop ; loop if count > 0 sh2ns addib,tr 1,brindex,sh2sb+4 ; increment index extru pu,29,30,pu ; shift unsigned ; -sh2s shd pu,pl,2,pl ; shift with minus sign - shd pm,pu,2,pu ; +sh2s shd pu,pl,2,pl ; shift with minus sign + shd pm,pu,2,pu ; sub pu,op1,pu ; subtract op1 shd pu,pl,2,pl ; shift with minus sign addib,> -1,cnt,mloop ; decrement count, loop if > 0 @@ -240,7 +240,7 @@ sh1sa extrs pu,30,31,pu ; signed sub pu,op1,pu ; subtract op1 from product shd pu,pl,3,pl ; shift 3 with minus sign addib,> -1,cnt,mloop ; decrement count, loop if >0 - shd pm,pu,3,pu + shd pm,pu,3,pu addb,tr op1,pu,lastadd ; do one more add, then finish addb,=,n saveop2,gr0,fini ; check saveop2 ; @@ -251,7 +251,7 @@ sh2us extru pu,29,30,pu ; shift 2 unsigned addb,tr op1,pu,sh2a ; add op1 shd pu,pl,2,pl ; shift 2 bits ; -sh2c shd pu,pl,2,pl +sh2c shd pu,pl,2,pl shd pc,pu,2,pu ; shift with carry addb,tr op1,pu,sh2a ; add op1 to product shd pu,pl,2,pl ; br. to sh2 to shift pu diff --git a/sys/arch/hppa/spmath/setovfl.c b/sys/arch/hppa/spmath/setovfl.c index e829a317bc5..c28074bda40 100644 --- a/sys/arch/hppa/spmath/setovfl.c +++ b/sys/arch/hppa/spmath/setovfl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: setovfl.c,v 1.5 2002/05/07 22:19:30 mickey Exp $ */ +/* $OpenBSD: setovfl.c,v 1.6 2002/09/20 19:26:59 mickey Exp $ */ /* (c) Copyright 1986 HEWLETT-PACKARD COMPANY To anyone who acknowledges that this file is provided "AS IS" @@ -19,7 +19,7 @@ #include "dbl_float.h" /*ARGSUSED*/ -sgl_floating_point +sgl_floating_point sgl_setoverflow(sign) unsigned int sign; { @@ -55,8 +55,8 @@ sgl_setoverflow(sign) } /*ARGSUSED*/ -dbl_floating_point -dbl_setoverflow(sign) +dbl_floating_point +dbl_setoverflow(sign) unsigned int sign; { dbl_floating_point result; diff --git a/sys/arch/hppa/spmath/sfcmp.c b/sys/arch/hppa/spmath/sfcmp.c index 89133920823..e8583fe284c 100644 --- a/sys/arch/hppa/spmath/sfcmp.c +++ b/sys/arch/hppa/spmath/sfcmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sfcmp.c,v 1.5 2002/05/07 22:19:30 mickey Exp $ */ +/* $OpenBSD: sfcmp.c,v 1.6 2002/09/20 19:26:59 mickey Exp $ */ /* (c) Copyright 1986 HEWLETT-PACKARD COMPANY To anyone who acknowledges that this file is provided "AS IS" @@ -16,7 +16,7 @@ #include "float.h" #include "sgl_float.h" - + /* * sgl_cmp: compare two values */ diff --git a/sys/arch/hppa/spmath/sgl_float.h b/sys/arch/hppa/spmath/sgl_float.h index ef2ecae8ce4..8cf4f88ac1c 100644 --- a/sys/arch/hppa/spmath/sgl_float.h +++ b/sys/arch/hppa/spmath/sgl_float.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sgl_float.h,v 1.7 2002/05/07 22:19:30 mickey Exp $ */ +/* $OpenBSD: sgl_float.h,v 1.8 2002/09/20 19:26:59 mickey Exp $ */ /* (c) Copyright 1986 HEWLETT-PACKARD COMPANY To anyone who acknowledges that this file is provided "AS IS" @@ -318,4 +318,3 @@ int sgl_frem(sgl_floating_point *, sgl_floating_point *, sgl_floating_point *, u int sgl_fsqrt(sgl_floating_point *, sgl_floating_point *, unsigned int *); int sgl_fsub(sgl_floating_point *, sgl_floating_point *, sgl_floating_point *, unsigned int *); int sgl_frnd(sgl_floating_point *, sgl_floating_point *, unsigned int *); - |