aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-10-12 00:19:17 +0000
committerUlrich Drepper <drepper@redhat.com>1999-10-12 00:19:17 +0000
commit48ac0597336da20bedb567734cfa10a34128008c (patch)
tree4a8bd63b90e10a0286a5c8a623dd1a385f360dbf
parent0d57f6957019317183e9e6d82dd587dc7bde48bf (diff)
downloadglibc-48ac0597336da20bedb567734cfa10a34128008c.tar
glibc-48ac0597336da20bedb567734cfa10a34128008c.tar.gz
glibc-48ac0597336da20bedb567734cfa10a34128008c.tar.bz2
glibc-48ac0597336da20bedb567734cfa10a34128008c.zip
Update.
1999-10-11 Ulrich Drepper <drepper@cygnus.com> * malloc/memprof.c (GETSP): Define for PowerPC. (GETTIME): Fix generic version.
-rw-r--r--ChangeLog5
-rw-r--r--malloc/memprof.c5
-rw-r--r--sysdeps/powerpc/__longjmp.S2
-rw-r--r--sysdeps/powerpc/fpu/s_fabs.S2
-rw-r--r--sysdeps/powerpc/fpu/s_fmax.S6
-rw-r--r--sysdeps/powerpc/fpu/s_fmin.S6
6 files changed, 17 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index ca9f10cab3..8434d16b3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-10-11 Ulrich Drepper <drepper@cygnus.com>
+
+ * malloc/memprof.c (GETSP): Define for PowerPC.
+ (GETTIME): Fix generic version.
+
1999-10-10 Philip Blundell <philb@gnu.org>
* sunrpc/xdr_float.c (LSW): Depend on __FLOAT_WORD_ORDER not
diff --git a/malloc/memprof.c b/malloc/memprof.c
index 1830d33ae6..c91b7cc237 100644
--- a/malloc/memprof.c
+++ b/malloc/memprof.c
@@ -83,6 +83,9 @@ static uintptr_t start_sp;
#ifdef __sparc__
# define GETSP() ({ register uintptr_t stack_ptr asm ("%sp"); stack_ptr; })
#endif
+#ifdef __powerpc__
+# define GETSP() ({ register uintptr_t stack_ptr asm ("%r1"); stack_ptr; })
+#endif
#ifdef __i386__
# define GETTIME(low,high) asm ("rdtsc" : "=a" (low), "=d" (high))
@@ -93,7 +96,7 @@ static uintptr_t start_sp;
struct timeval tval; \
uint64_t usecs; \
gettimeofday (&tval, NULL); \
- usecs = (uint64_t) tval.tv_usec + (uint64_t) tval_usec * 1000000; \
+ usecs = (uint64_t) tval.tv_usec + (uint64_t) tval.tv_usec * 1000000; \
low = usecs & 0xffffffff; \
high = usecs >> 32; \
}
diff --git a/sysdeps/powerpc/__longjmp.S b/sysdeps/powerpc/__longjmp.S
index b29f72c3db..7f32b22c1b 100644
--- a/sysdeps/powerpc/__longjmp.S
+++ b/sysdeps/powerpc/__longjmp.S
@@ -60,7 +60,7 @@ ENTRY (__longjmp)
lwz r28,((JB_GPRS+14)*4)(r3)
lfd fp28,((JB_FPRS+14*2)*4)(r3)
lwz r29,((JB_GPRS+15)*4)(r3)
- lfd f29,((JB_FPRS+15*2)*4)(r3)
+ lfd fp29,((JB_FPRS+15*2)*4)(r3)
lwz r30,((JB_GPRS+16)*4)(r3)
lfd fp30,((JB_FPRS+16*2)*4)(r3)
lwz r31,((JB_GPRS+17)*4)(r3)
diff --git a/sysdeps/powerpc/fpu/s_fabs.S b/sysdeps/powerpc/fpu/s_fabs.S
index f152079e0a..cf92e00289 100644
--- a/sysdeps/powerpc/fpu/s_fabs.S
+++ b/sysdeps/powerpc/fpu/s_fabs.S
@@ -21,7 +21,7 @@
ENTRY(__fabs)
/* double [f1] fabs (double [f1] x); */
- fabs f1,f1
+ fabs fp1,fp1
blr
END(__fabs)
diff --git a/sysdeps/powerpc/fpu/s_fmax.S b/sysdeps/powerpc/fpu/s_fmax.S
index 3721db4c94..d6e5ec58b1 100644
--- a/sysdeps/powerpc/fpu/s_fmax.S
+++ b/sysdeps/powerpc/fpu/s_fmax.S
@@ -21,13 +21,13 @@
ENTRY(__fmax)
/* double [f1] fmax (double [f1] x, double [f2] y); */
- fcmpu cr0,f1,f2
+ fcmpu cr0,fp1,fp2
blt cr0,0f /* if x < y, neither x nor y can be NaN... */
bnulr+ cr0
/* x and y are unordered, so one of x or y must be a NaN... */
- fcmpu cr1,f2,f2
+ fcmpu cr1,fp2,fp2
bunlr cr1
-0: fmr f1,f2
+0: fmr fp1,fp2
blr
END(__fmax)
diff --git a/sysdeps/powerpc/fpu/s_fmin.S b/sysdeps/powerpc/fpu/s_fmin.S
index 384995f847..6e74ba2b58 100644
--- a/sysdeps/powerpc/fpu/s_fmin.S
+++ b/sysdeps/powerpc/fpu/s_fmin.S
@@ -21,13 +21,13 @@
ENTRY(__fmin)
/* double [f1] fmin (double [f1] x, double [f2] y); */
- fcmpu cr0,f1,f2
+ fcmpu cr0,fp1,fp2
bgt cr0,0f /* if x > y, neither x nor y can be NaN... */
bnulr+ cr0
/* x and y are unordered, so one of x or y must be a NaN... */
- fcmpu cr1,f2,f2
+ fcmpu cr1,fp2,fp2
bunlr cr1
-0: fmr f1,f2
+0: fmr fp1,fp2
blr
END(__fmin)