summaryrefslogtreecommitdiff
path: root/sys/arch/hppa
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2002-04-02 17:54:28 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2002-04-02 17:54:28 +0000
commit88b0fb2b2f49bec128afc7a42c1ecba5b952d658 (patch)
treee228181d74cf7fd2be22562655d1a46f27d32ff3 /sys/arch/hppa
parent83110b4fa02c1be57a5cf7689135fdf098999efc (diff)
time and time+4 might not be the same in the %hi (copycat jason)
Diffstat (limited to 'sys/arch/hppa')
-rw-r--r--sys/arch/hppa/hppa/locore.S24
1 files changed, 13 insertions, 11 deletions
diff --git a/sys/arch/hppa/hppa/locore.S b/sys/arch/hppa/hppa/locore.S
index 3f096778319..7abfa887ab3 100644
--- a/sys/arch/hppa/hppa/locore.S
+++ b/sys/arch/hppa/hppa/locore.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.S,v 1.63 2002/04/01 16:19:58 mickey Exp $ */
+/* $OpenBSD: locore.S,v 1.64 2002/04/02 17:54:27 mickey Exp $ */
/*
* Copyright (c) 1998-2002 Michael Shalayeff
@@ -1412,6 +1412,7 @@ LEAF_ENTRY(pbtlb_l)
; DR_PAGE0
rsm (PSW_R|PSW_I), t4
ldil L%0xc041, t1
+ ldo R%0xc041(t1), t1
dep arg0, 30, 3, t1
sync
MTCPU_T(22,DR_DTLB) /* t1 */
@@ -2231,29 +2232,30 @@ EXIT(spstrcpy)
/*
* adjust the time value
- * XXX: do it the easy way, later we will calculate actual fuzz from itr
+ * XXX: do it the easy way, later we will calculate actual fuzz from itmr
*/
LEAF_ENTRY(microtime)
- .import time, data
- ldil L%-1000000, t3
- ldil L%time, t1
- ldo R%-1000000(t3), t3
-
/* t4 = splhigh() */
mfctl eiem, t4
mtctl r0, eiem
- ldw R%time+4(t1), t2
- ldw R%time(t1), t1
+ .import time, data
+ ldil L%time, t3
+ ldo R%time(t3), t3
+ ldw 0(t3), t1
+ ldw 4(t3), t2
/* splx(t4) */
mtctl t4, eiem
+ ldil L%-1000000, t3
+ ldo R%-1000000(t3), t3
+
addi 1, t2, t2
- addb,< t2, t3, microtime_no
- addi 1, t1, t1
+ addb,<,n t2, t3, microtime_no
+ addi 1, t1, t1
copy t3, t2
microtime_no