summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVisa Hankala <visa@cvs.openbsd.org>2019-01-05 12:17:00 +0000
committerVisa Hankala <visa@cvs.openbsd.org>2019-01-05 12:17:00 +0000
commit80f94e5bf7dc1912dfd911039357b4bffbac674e (patch)
treefa265e5a0eb19ea02c75e330ef01a5834acf5c0a
parent142fbdecc6517c9ab3d632c4bd7b82c8bf90e3c0 (diff)
Replace two-operand instruction aliases that clang does not
understand with the three-operand instructions. No binary change with gas.
-rw-r--r--lib/libc/arch/mips64/gen/ldexp.S4
-rw-r--r--sys/arch/mips64/mips64/tlbhandler.S4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libc/arch/mips64/gen/ldexp.S b/lib/libc/arch/mips64/gen/ldexp.S
index 8844078ceff..914924ff634 100644
--- a/lib/libc/arch/mips64/gen/ldexp.S
+++ b/lib/libc/arch/mips64/gen/ldexp.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: ldexp.S,v 1.8 2017/10/15 12:07:27 visa Exp $ */
+/* $OpenBSD: ldexp.S,v 1.9 2019/01/05 12:16:59 visa Exp $ */
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -159,7 +159,7 @@ LEAF(ldexp, 0)
bge t3, zero, 1f # should result be negative infinity?
neg.d $f0, $f0 # result is negative infinity
1:
- add.d $f0, $f0 # cause overflow faults if enabled
+ add.d $f0, $f0, $f0 # cause overflow faults if enabled
j ra
9:
mov.d $f0, $f12 # yes, result is just x
diff --git a/sys/arch/mips64/mips64/tlbhandler.S b/sys/arch/mips64/mips64/tlbhandler.S
index 481e24a17d8..c040f404d58 100644
--- a/sys/arch/mips64/mips64/tlbhandler.S
+++ b/sys/arch/mips64/mips64/tlbhandler.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: tlbhandler.S,v 1.48 2018/12/13 16:35:07 visa Exp $ */
+/* $OpenBSD: tlbhandler.S,v 1.49 2019/01/05 12:16:59 visa Exp $ */
/*
* Copyright (c) 1995-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -337,7 +337,7 @@ sys_stk_chk:
GET_CPU_INFO(k1, k0)
PTR_L k1, CI_CURPROCPADDR(k1)
PTR_SUBU k0, sp, k1 # check to see if we have a
- sltiu k0, 2048 # valid kernel stack
+ sltiu k0, k0, 2048 # valid kernel stack
beqz k0, go_k_general # yes, handle.
nop