Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/mips/mips make !DDB kernels build.



details:   https://anonhg.NetBSD.org/src/rev/4eb7c7fcc603
branches:  trunk
changeset: 955198:4eb7c7fcc603
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Sep 23 09:56:33 2020 +0000

description:
make !DDB kernels build.

diffstat:

 sys/arch/mips/mips/mips_stacktrace.c |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r c67f154eea82 -r 4eb7c7fcc603 sys/arch/mips/mips/mips_stacktrace.c
--- a/sys/arch/mips/mips/mips_stacktrace.c      Wed Sep 23 09:52:02 2020 +0000
+++ b/sys/arch/mips/mips/mips_stacktrace.c      Wed Sep 23 09:56:33 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mips_stacktrace.c,v 1.5 2020/09/23 09:52:02 simonb Exp $       */
+/*     $NetBSD: mips_stacktrace.c,v 1.6 2020/09/23 09:56:33 mrg Exp $  */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mips_stacktrace.c,v 1.5 2020/09/23 09:52:02 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_stacktrace.c,v 1.6 2020/09/23 09:56:33 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -53,6 +53,7 @@
 
 #include <mips/locore.h>
 #include <mips/mips_opcode.h>
+#include <mips/regnum.h>
 #include <mips/stacktrace.h>
 
 #if defined(_KMEMUSER) && !defined(DDB)
@@ -228,13 +229,13 @@
        } else {
                if (sizeof(mips_reg_t) == 8 && n == 8)
 #if _KERNEL
+                       rc = *(int64_t *)addr;
+               else
+                       rc = *(int32_t *)addr;
+#else
                        db_read_bytes((db_addr_t)addr, sizeof(int64_t), (char *)&rc);
                else
                        db_read_bytes((db_addr_t)addr, sizeof(int32_t), (char *)&rc);
-#else
-                       rc = *(int64_t *)addr;
-               else
-                       rc = *(int32_t *)addr;
 #endif
        }
        return rc;



Home | Main Index | Thread Index | Old Index