Mon Feb 27 06:56:33 2017 UTC ()
the second operand to cfc1/ctc1 isn't an FPU data register
so don't make it look like one.


(chs)
diff -r1.30 -r1.31 src/sys/arch/mips/mips/db_disasm.c

cvs diff -r1.30 -r1.31 src/sys/arch/mips/mips/db_disasm.c (expand / switch to unified diff)

--- src/sys/arch/mips/mips/db_disasm.c 2015/06/27 03:31:29 1.30
+++ src/sys/arch/mips/mips/db_disasm.c 2017/02/27 06:56:32 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: db_disasm.c,v 1.30 2015/06/27 03:31:29 matt Exp $ */ 1/* $NetBSD: db_disasm.c,v 1.31 2017/02/27 06:56:32 chs Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1991, 1993 4 * Copyright (c) 1991, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to Berkeley by 7 * This code is derived from software contributed to Berkeley by
8 * Ralph Campbell. 8 * Ralph Campbell.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -25,27 +25,27 @@ @@ -25,27 +25,27 @@
25 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 25 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE. 32 * SUCH DAMAGE.
33 * 33 *
34 * from: @(#)kadb.c 8.1 (Berkeley) 6/10/93 34 * from: @(#)kadb.c 8.1 (Berkeley) 6/10/93
35 */ 35 */
36 36
37#include <sys/cdefs.h> 37#include <sys/cdefs.h>
38__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.30 2015/06/27 03:31:29 matt Exp $"); 38__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.31 2017/02/27 06:56:32 chs Exp $");
39 39
40#include <sys/param.h> 40#include <sys/param.h>
41#include <sys/cpu.h> 41#include <sys/cpu.h>
42#include <sys/systm.h> 42#include <sys/systm.h>
43 43
44#include <mips/locore.h> 44#include <mips/locore.h>
45#include <mips/mips_opcode.h> 45#include <mips/mips_opcode.h>
46#include <mips/reg.h> 46#include <mips/reg.h>
47 47
48#include <machine/db_machdep.h> 48#include <machine/db_machdep.h>
49 49
50#include <ddb/db_interface.h> 50#include <ddb/db_interface.h>
51#include <ddb/db_output.h> 51#include <ddb/db_output.h>
@@ -613,33 +613,33 @@ db_disasm_insn(int insn, db_addr_t loc,  @@ -613,33 +613,33 @@ db_disasm_insn(int insn, db_addr_t loc,
613 case OP_MT: 613 case OP_MT:
614 db_printf("mtc1\t%s,f%d", 614 db_printf("mtc1\t%s,f%d",
615 reg_name[i.RType.rt], 615 reg_name[i.RType.rt],
616 i.RType.rd); 616 i.RType.rd);
617 break; 617 break;
618 618
619 case OP_MF: 619 case OP_MF:
620 db_printf("mfc1\t%s,f%d", 620 db_printf("mfc1\t%s,f%d",
621 reg_name[i.RType.rt], 621 reg_name[i.RType.rt],
622 i.RType.rd); 622 i.RType.rd);
623 break; 623 break;
624 624
625 case OP_CT: 625 case OP_CT:
626 db_printf("ctc1\t%s,f%d", 626 db_printf("ctc1\t%s,%d",
627 reg_name[i.RType.rt], 627 reg_name[i.RType.rt],
628 i.RType.rd); 628 i.RType.rd);
629 break; 629 break;
630 630
631 case OP_CF: 631 case OP_CF:
632 db_printf("cfc1\t%s,f%d", 632 db_printf("cfc1\t%s,%d",
633 reg_name[i.RType.rt], 633 reg_name[i.RType.rt],
634 i.RType.rd); 634 i.RType.rd);
635 break; 635 break;
636 636
637 case OP_DMT: 637 case OP_DMT:
638 db_printf("dmtc1\t%s,f%d", 638 db_printf("dmtc1\t%s,f%d",
639 reg_name[i.RType.rt], 639 reg_name[i.RType.rt],
640 i.RType.rd); 640 i.RType.rd);
641 break; 641 break;
642 642
643 case OP_DMF: 643 case OP_DMF:
644 db_printf("dmfc1\t%s,f%d", 644 db_printf("dmfc1\t%s,f%d",
645 reg_name[i.RType.rt], 645 reg_name[i.RType.rt],