Sun Jul 11 01:55:51 2021 UTC ()
Pull in pmap_subr.s (missed in prior commit).


(thorpej)
diff -r1.139 -r1.140 src/sys/arch/alpha/alpha/locore.s
cvs diff -r1.139 -r1.140 src/sys/arch/alpha/alpha/locore.s (expand / switch to unified diff)

--- src/sys/arch/alpha/alpha/locore.s 2021/07/07 03:30:35 1.139
+++ src/sys/arch/alpha/alpha/locore.s 2021/07/11 01:55:51 1.140
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: locore.s,v 1.139 2021/07/07 03:30:35 thorpej Exp $ */ 1/* $NetBSD: locore.s,v 1.140 2021/07/11 01:55:51 thorpej Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1999, 2000, 2019 The NetBSD Foundation, Inc. 4 * Copyright (c) 1999, 2000, 2019 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, 8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
9 * NASA Ames Research Center. 9 * NASA Ames Research Center.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions 12 * modification, are permitted provided that the following conditions
13 * are met: 13 * are met:
14 * 1. Redistributions of source code must retain the above copyright 14 * 1. Redistributions of source code must retain the above copyright
@@ -57,27 +57,27 @@ @@ -57,27 +57,27 @@
57 * rights to redistribute these changes. 57 * rights to redistribute these changes.
58 */ 58 */
59 59
60.stabs __FILE__,100,0,0,kernel_text 60.stabs __FILE__,100,0,0,kernel_text
61 61
62#include "opt_ddb.h" 62#include "opt_ddb.h"
63#include "opt_kgdb.h" 63#include "opt_kgdb.h"
64#include "opt_multiprocessor.h" 64#include "opt_multiprocessor.h"
65#include "opt_lockdebug.h" 65#include "opt_lockdebug.h"
66#include "opt_compat_netbsd.h" 66#include "opt_compat_netbsd.h"
67 67
68#include <machine/asm.h> 68#include <machine/asm.h>
69 69
70__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.139 2021/07/07 03:30:35 thorpej Exp $"); 70__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.140 2021/07/11 01:55:51 thorpej Exp $");
71 71
72#include "assym.h" 72#include "assym.h"
73 73
74.stabs __FILE__,132,0,0,kernel_text 74.stabs __FILE__,132,0,0,kernel_text
75 75
76 /* don't reorder instructions; paranoia. */ 76 /* don't reorder instructions; paranoia. */
77 .set noreorder 77 .set noreorder
78 .text 78 .text
79 79
80 .macro bfalse reg, dst 80 .macro bfalse reg, dst
81 beq \reg, \dst 81 beq \reg, \dst
82 .endm 82 .endm
83 83
@@ -207,26 +207,35 @@ NESTED_NOPROFILE(locorestart,1,0,ra,0,0) @@ -207,26 +207,35 @@ NESTED_NOPROFILE(locorestart,1,0,ra,0,0)
207/**************************************************************************/ 207/**************************************************************************/
208 208
209#if defined(DDB) || defined(KGDB) 209#if defined(DDB) || defined(KGDB)
210/* 210/*
211 * Pull in debugger glue. 211 * Pull in debugger glue.
212 */ 212 */
213#include <alpha/alpha/debug.s> 213#include <alpha/alpha/debug.s>
214#endif /* DDB || KGDB */ 214#endif /* DDB || KGDB */
215 215
216/**************************************************************************/ 216/**************************************************************************/
217 217
218/**************************************************************************/ 218/**************************************************************************/
219 219
 220/*
 221 * Pull in optimized pmap subroutines.
 222 */
 223#include <alpha/alpha/pmap_subr.s>
 224
 225/**************************************************************************/
 226
 227/**************************************************************************/
 228
220 .text 229 .text
221.stabs __FILE__,132,0,0,backtolocore1 /* done with includes */ 230.stabs __FILE__,132,0,0,backtolocore1 /* done with includes */
222.loc 1 __LINE__ 231.loc 1 __LINE__
223backtolocore1: 232backtolocore1:
224/**************************************************************************/ 233/**************************************************************************/
225 234
226#ifdef COMPAT_16 235#ifdef COMPAT_16
227/* 236/*
228 * Signal "trampoline" code. 237 * Signal "trampoline" code.
229 * 238 *
230 * The kernel arranges for the handler to be invoked directly. This 239 * The kernel arranges for the handler to be invoked directly. This
231 * trampoline is used only to return from the signal. 240 * trampoline is used only to return from the signal.
232 * 241 *