Module Name: src Committed By: skrll Date: Fri Jun 2 21:20:47 UTC 2017
Modified Files: src/sys/arch/arm/arm: disassem.c Log Message: Fix the fix by removing redundant lines. Thanks chuq. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/arm/arm/disassem.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/arm/arm/disassem.c diff -u src/sys/arch/arm/arm/disassem.c:1.37 src/sys/arch/arm/arm/disassem.c:1.38 --- src/sys/arch/arm/arm/disassem.c:1.37 Fri Jun 2 19:58:31 2017 +++ src/sys/arch/arm/arm/disassem.c Fri Jun 2 21:20:47 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: disassem.c,v 1.37 2017/06/02 19:58:31 skrll Exp $ */ +/* $NetBSD: disassem.c,v 1.38 2017/06/02 21:20:47 skrll Exp $ */ /* * Copyright (c) 1996 Mark Brinicombe. @@ -49,7 +49,7 @@ #include <sys/param.h> -__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.37 2017/06/02 19:58:31 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.38 2017/06/02 21:20:47 skrll Exp $"); #include <sys/systm.h> @@ -215,15 +215,11 @@ static const struct arm32_insn arm32_i[] { 0x0e1000f0, 0x000000b0, "strh", "de" }, { 0x0e1000f0, 0x001000b0, "ldrh", "de" }, - { 0x0e5000f0, 0x000000d0, "ldrd", "de" }, - { 0x0e1000f0, 0x001000d0, "ldrsb", "de" }, { 0x0e1000f0, 0x000000d0, "ldrd", "de" }, { 0x0e1000f0, 0x001000d0, "ldrsb", "de" }, { 0x0e1000f0, 0x000000f0, "strd", "de" }, { 0x0e1000f0, 0x001000f0, "ldrsh", "de" }, - { 0x0e1000f0, 0x000000f0, "strd", "de" }, - { 0x0e1000f0, 0x001000f0, "ldrsh", "de" }, /* A5.2.11 MSR (immediate), and hints */ { 0x0fffffff, 0x0320f000, "nop", "" },