[src/trunk]: src/sys/arch Make "options ARMFPE" work again.

[bjh21 <bjh21%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9fcfd531e965
branches:  trunk
changeset: 504524:9fcfd531e965
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Sun Mar 04 14:32:12 2001 +0000

description:
Make "options ARMFPE" work again.
Mostly due to Richard Earnshaw.

diffstat:

 sys/arch/arm/include/cpus.h          |  6 +++++-
 sys/arch/arm32/arm32/genassym.cf     |  4 +++-
 sys/arch/arm32/fpe-arm/armfpe_glue.S |  6 +++---
 sys/arch/hpcarm/hpcarm/genassym.cf   |  4 +++-
 4 files changed, 14 insertions(+), 6 deletions(-)

diffs (81 lines):

diff -r 688aeb22f8fe -r 9fcfd531e965 sys/arch/arm/include/cpus.h
--- a/sys/arch/arm/include/cpus.h       Sun Mar 04 14:26:26 2001 +0000
+++ b/sys/arch/arm/include/cpus.h       Sun Mar 04 14:32:12 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpus.h,v 1.5 2001/03/03 21:34:00 bjh21 Exp $   */
+/*     $NetBSD: cpus.h,v 1.6 2001/03/04 14:32:12 bjh21 Exp $   */
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -41,6 +41,9 @@
  * Created      : 26/12/95
  */
 
+#ifndef _ARM_CPUS_H_
+#define _ARM_CPUS_H_
+
 #define MAX_CPUS               2
 #define MAX_SLAVE_CPUS         0
 #define MAX_FOREIGN_CPUS       1
@@ -102,3 +105,4 @@
 #endif /* _LOCORE */
 
 /* End of cpus.h */
+#endif
diff -r 688aeb22f8fe -r 9fcfd531e965 sys/arch/arm32/arm32/genassym.cf
--- a/sys/arch/arm32/arm32/genassym.cf  Sun Mar 04 14:26:26 2001 +0000
+++ b/sys/arch/arm32/arm32/genassym.cf  Sun Mar 04 14:32:12 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.7 2001/02/28 18:15:43 bjh21 Exp $
+#      $NetBSD: genassym.cf,v 1.8 2001/03/04 14:32:12 bjh21 Exp $
 
 # Copyright (c) 1982, 1990 The Regents of the University of California.
 # All rights reserved.
@@ -143,3 +143,5 @@
 define CF_CACHE_PURGE_ID       offsetof(struct cpu_functions, cf_cache_purgeID)
 define CF_CONTEXT_SWITCH       offsetof(struct cpu_functions, cf_context_switch)
 define CF_SLEEP                offsetof(struct cpu_functions, cf_sleep)
+
+define CI_CURPRIORITY          offsetof(struct cpu_info, ci_schedstate.spc_curpriority)
diff -r 688aeb22f8fe -r 9fcfd531e965 sys/arch/arm32/fpe-arm/armfpe_glue.S
--- a/sys/arch/arm32/fpe-arm/armfpe_glue.S      Sun Mar 04 14:26:26 2001 +0000
+++ b/sys/arch/arm32/fpe-arm/armfpe_glue.S      Sun Mar 04 14:32:12 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: armfpe_glue.S,v 1.13 1999/10/26 06:53:43 cgd Exp $ */
+/* $NetBSD: armfpe_glue.S,v 1.14 2001/03/04 14:32:12 bjh21 Exp $ */
 
 /*
  * Copyright (c) 1996 Mark Brinicombe
@@ -212,7 +212,7 @@
        .word   _curproc
 
 Lcurpriority:
-       .word   _curpriority
+       .word   _cpu_info_store
 
 #endif
 
@@ -265,7 +265,7 @@
        ldrb    r1, [r0, #(P_USRPRI)]
        strb    r1, [r0, #(P_PRIORITY)]
        ldr     r0, Lcurpriority
-       strb    r1, [r0]
+       strb    r1, [r0, #(CI_CURPRIORITY)]
 
        /* Fast return */
        ldmfd   sp!, {r0-r3, pc}
diff -r 688aeb22f8fe -r 9fcfd531e965 sys/arch/hpcarm/hpcarm/genassym.cf
--- a/sys/arch/hpcarm/hpcarm/genassym.cf        Sun Mar 04 14:26:26 2001 +0000
+++ b/sys/arch/hpcarm/hpcarm/genassym.cf        Sun Mar 04 14:32:12 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.2 2001/02/28 18:15:44 bjh21 Exp $
+#      $NetBSD: genassym.cf,v 1.3 2001/03/04 14:32:12 bjh21 Exp $
 
 # Copyright (c) 1982, 1990 The Regents of the University of California.
 # All rights reserved.
@@ -143,3 +143,5 @@
 define CF_CACHE_PURGE_ID       offsetof(struct cpu_functions, cf_cache_purgeID)
 define CF_CONTEXT_SWITCH       offsetof(struct cpu_functions, cf_context_switch)
 define CF_SLEEP                offsetof(struct cpu_functions, cf_sleep)
+
+define CI_CURPRIORITY          offsetof(struct cpu_info, ci_schedstate.spc_curpriority)