Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/aarch64/aarch64 Use orr instead of mov (an alias fo...
details: https://anonhg.NetBSD.org/src/rev/84fedd7273f4
branches: trunk
changeset: 969422:84fedd7273f4
user: skrll <skrll%NetBSD.org@localhost>
date: Thu Feb 20 07:52:55 2020 +0000
description:
Use orr instead of mov (an alias for orr) to appease clang... *shrug*
diffstat:
sys/arch/aarch64/aarch64/locore.S | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diffs (38 lines):
diff -r 1a1837060396 -r 84fedd7273f4 sys/arch/aarch64/aarch64/locore.S
--- a/sys/arch/aarch64/aarch64/locore.S Thu Feb 20 07:07:02 2020 +0000
+++ b/sys/arch/aarch64/aarch64/locore.S Thu Feb 20 07:52:55 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.57 2020/02/15 13:51:33 tnn Exp $ */
+/* $NetBSD: locore.S,v 1.58 2020/02/20 07:52:55 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -38,7 +38,7 @@
#include <aarch64/hypervisor.h>
#include "assym.h"
-RCSID("$NetBSD: locore.S,v 1.57 2020/02/15 13:51:33 tnn Exp $")
+RCSID("$NetBSD: locore.S,v 1.58 2020/02/20 07:52:55 skrll Exp $")
#ifdef AARCH64_DEVICE_MEM_STRONGLY_ORDERED
#define MAIR_DEVICE_MEM MAIR_DEVICE_nGnRnE
@@ -455,7 +455,8 @@
/* x28 = &arm_cpu_hatched[cpuindex / (sizeof(u_long) * NBBY)] */
adrl x0, _C_LABEL(arm_cpu_hatched)
- mov x1, x27, lsr #6
+ // Appease clang - mov x1, x27, lsr #6
+ orr x1, xzr, x27, lsr #6
add x28, x0, x1, lsl #3
/* x29 = __BIT(cpuindex % (sizeof(u_long) * NBBY)) */
@@ -476,7 +477,8 @@
/* x28 = &arm_cpu_mbox[cpuindex / (sizeof(u_long) * NBBY)] */
adrl x0, _C_LABEL(arm_cpu_mbox)
- mov x1, x27, lsr #6
+ // Appease clang - mov x1, x27, lsr #6
+ orr x1, xzr, x27, lsr #6
add x28, x0, x1, lsl #3
/* wait for the mailbox start bit to become true */
Home |
Main Index |
Thread Index |
Old Index