Module Name: src
Committed By: riastradh
Date: Sat Apr 9 14:09:32 UTC 2022
Modified Files:
src/sys/arch/mips/include: asm.h
src/sys/arch/mips/rmi: rmixl_cpu.c
Log Message:
mips/rmi: Hack to get XLSATX64.MP kernel building again.
Using <mips/asm.h> in a .c file is kinda grody but CALLFRAME_SIZ
doesn't seem to be defined anywhere else. Not sure how this was ever
supposed to work...
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/mips/include/asm.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mips/rmi/rmixl_cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/include/asm.h
diff -u src/sys/arch/mips/include/asm.h:1.69 src/sys/arch/mips/include/asm.h:1.70
--- src/sys/arch/mips/include/asm.h:1.69 Sun Feb 27 19:22:20 2022
+++ src/sys/arch/mips/include/asm.h Sat Apr 9 14:09:32 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: asm.h,v 1.69 2022/02/27 19:22:20 riastradh Exp $ */
+/* $NetBSD: asm.h,v 1.70 2022/04/09 14:09:32 riastradh Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -61,12 +61,14 @@
#include "opt_gprof.h"
#endif
+#ifdef __ASSEMBLER__
#define __BIT(n) (1 << (n))
#define __BITS(hi,lo) ((~((~0)<<((hi)+1)))&((~0)<<(lo)))
#define __LOWEST_SET_BIT(__mask) ((((__mask) - 1) & (__mask)) ^ (__mask))
#define __SHIFTOUT(__x, __mask) (((__x) & (__mask)) / __LOWEST_SET_BIT(__mask))
#define __SHIFTIN(__x, __mask) ((__x) * __LOWEST_SET_BIT(__mask))
+#endif /* __ASSEMBLER__ */
/*
* Define -pg profile entry code.
Index: src/sys/arch/mips/rmi/rmixl_cpu.c
diff -u src/sys/arch/mips/rmi/rmixl_cpu.c:1.12 src/sys/arch/mips/rmi/rmixl_cpu.c:1.13
--- src/sys/arch/mips/rmi/rmixl_cpu.c:1.12 Wed Aug 12 07:37:39 2020
+++ src/sys/arch/mips/rmi/rmixl_cpu.c Sat Apr 9 14:09:32 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_cpu.c,v 1.12 2020/08/12 07:37:39 skrll Exp $ */
+/* $NetBSD: rmixl_cpu.c,v 1.13 2022/04/09 14:09:32 riastradh Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_cpu.c,v 1.12 2020/08/12 07:37:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_cpu.c,v 1.13 2022/04/09 14:09:32 riastradh Exp $");
#include "opt_multiprocessor.h"
#include "opt_ddb.h"
@@ -65,6 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_cpu.c,
#include <mips/db_machdep.h>
#endif
+#include <mips/asm.h> /* XXX CALLFRAME_SIZ */
static int cpu_rmixl_match(device_t, cfdata_t, void *);
static void cpu_rmixl_attach(device_t, device_t, void *);
