Module Name: src
Committed By: mrg
Date: Wed Feb 6 07:32:50 UTC 2019
Modified Files:
src/sys/arch/powerpc/oea: cpu_subr.c oea_machdep.c
Log Message:
- add or adjust fallthru comments
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sys/arch/powerpc/oea/cpu_subr.c
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/powerpc/oea/oea_machdep.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/powerpc/oea/cpu_subr.c
diff -u src/sys/arch/powerpc/oea/cpu_subr.c:1.98 src/sys/arch/powerpc/oea/cpu_subr.c:1.99
--- src/sys/arch/powerpc/oea/cpu_subr.c:1.98 Sun Jan 6 11:20:53 2019
+++ src/sys/arch/powerpc/oea/cpu_subr.c Wed Feb 6 07:32:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_subr.c,v 1.98 2019/01/06 11:20:53 phx Exp $ */
+/* $NetBSD: cpu_subr.c,v 1.99 2019/02/06 07:32:50 mrg Exp $ */
/*-
* Copyright (c) 2001 Matt Thomas.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.98 2019/01/06 11:20:53 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.99 2019/02/06 07:32:50 mrg Exp $");
#include "opt_ppcparam.h"
#include "opt_ppccache.h"
@@ -1133,6 +1133,7 @@ cpu_get_dfs(void)
case MPC7448:
if (mfspr(SPR_HID1) & HID1_DFS4)
return 4;
+ /* FALLTHROUGH */
case MPC7447A:
if (mfspr(SPR_HID1) & HID1_DFS2)
return 2;
@@ -1155,6 +1156,7 @@ cpu_set_dfs(int div)
switch (vers) {
case MPC7448:
dfs_mask |= HID1_DFS4;
+ /* FALLTHROUGH */
case MPC7447A:
dfs_mask |= HID1_DFS2;
break;
Index: src/sys/arch/powerpc/oea/oea_machdep.c
diff -u src/sys/arch/powerpc/oea/oea_machdep.c:1.75 src/sys/arch/powerpc/oea/oea_machdep.c:1.76
--- src/sys/arch/powerpc/oea/oea_machdep.c:1.75 Sun Jul 15 05:16:44 2018
+++ src/sys/arch/powerpc/oea/oea_machdep.c Wed Feb 6 07:32:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: oea_machdep.c,v 1.75 2018/07/15 05:16:44 maxv Exp $ */
+/* $NetBSD: oea_machdep.c,v 1.76 2019/02/06 07:32:50 mrg Exp $ */
/*
* Copyright (C) 2002 Matt Thomas
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.75 2018/07/15 05:16:44 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.76 2019/02/06 07:32:50 mrg Exp $");
#include "opt_ppcarch.h"
#include "opt_compat_netbsd.h"
@@ -260,15 +260,14 @@ oea_init(void (*handler)(void))
#if defined(DDB) || defined(KGDB)
case EXC_RUNMODETRC:
#ifdef PPC_OEA601
- if (cpuvers != MPC601) {
+ if (cpuvers != MPC601)
#endif
+ {
size = (size_t)trapsize;
memcpy((void *)exc, trapcode, size);
break;
-#ifdef PPC_OEA601
}
/* FALLTHROUGH */
-#endif
case EXC_PGM:
case EXC_TRC:
case EXC_BPT:
