From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6155 invoked by alias); 3 May 2006 20:57:43 -0000 Received: (qmail 6144 invoked by uid 22791); 3 May 2006 20:57:42 -0000 X-Spam-Check-By: sourceware.org Received: from bender.bawue.de (HELO bender.bawue.de) (193.7.176.20) by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 03 May 2006 20:57:38 +0000 Received: from lagash (unknown [194.74.144.146]) by bender.bawue.de (Postfix) with ESMTP id 0BA3744C5D; Wed, 3 May 2006 22:57:35 +0200 (MEST) Received: from ths by lagash with local (Exim 4.61) (envelope-from ) id 1FbOOu-0007xK-7K; Wed, 03 May 2006 21:56:48 +0100 Date: Wed, 03 May 2006 20:57:00 -0000 To: binutils@sourceware.org Cc: drow@false.org Subject: [PATCH] Fix MIPS mftr argument order. Message-ID: <20060503205648.GC18218@networkno.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.11+cvs20060403 From: Thiemo Seufer X-IsSubscribed: yes Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org X-SW-Source: 2006-05/txt/msg00077.txt.bz2 Hello All, this fixes swapped arguments for rd and rt in the assembler/disassembler. The bug hits only the raw mftr assembly, not the aliases which are recommended to use. Committed. Daniel, this should also go in the branch. Any objections? Thiemo 2006-05-03 Thiemo Seufer [ opcodes/ChangeLog ] * mips-opc.c (mips_builtin_opcodes): Fix mftr argument order. [ gas/testsuite/ChangeLog ] * gas/mips/mips32-mt.d: Fix mftr argument order. Index: gas/testsuite/gas/mips/mips32-mt.d =================================================================== RCS file: /cvs/src/src/gas/testsuite/gas/mips/mips32-mt.d,v retrieving revision 1.1 diff -u -p -r1.1 mips32-mt.d --- gas/testsuite/gas/mips/mips32-mt.d 6 Sep 2005 18:56:21 -0000 1.1 +++ gas/testsuite/gas/mips/mips32-mt.d 3 May 2006 19:15:27 -0000 @@ -567,134 +567,134 @@ Disassembly of section .text: 0+08b0 <[^>]*> 418a5824 mttc2 t2,\$11 0+08b4 <[^>]*> 418b6034 mtthc2 t3,\$12 0+08b8 <[^>]*> 418c6825 cttc2 t4,\$13 -0+08bc <[^>]*> 410d7030 mftr t5,t6,1,0,1 -0+08c0 <[^>]*> 410d7031 mftr t5,t6,1,1,1 -0+08c4 <[^>]*> 410d7032 mfthc1 t6,\$f13 -0+08c8 <[^>]*> 410d7033 mftr t5,t6,1,3,1 -0+08cc <[^>]*> 410d7034 mfthc2 t6,\$13 -0+08d0 <[^>]*> 410d7035 mftr t5,t6,1,5,1 -0+08d4 <[^>]*> 410d7036 mftr t5,t6,1,6,1 -0+08d8 <[^>]*> 410d7037 mftr t5,t6,1,7,1 -0+08dc <[^>]*> 410d7020 mftgpr t6,t5 -0+08e0 <[^>]*> 410d7021 mfthi t6,\$ac3 -0+08e4 <[^>]*> 410d7022 mftc1 t6,\$f13 -0+08e8 <[^>]*> 410d7023 cftc1 t6,\$13 -0+08ec <[^>]*> 410d7024 mftc2 t6,\$13 -0+08f0 <[^>]*> 410d7025 cftc2 t6,\$13 -0+08f4 <[^>]*> 410d7026 mftr t5,t6,1,6,0 -0+08f8 <[^>]*> 410d7027 mftr t5,t6,1,7,0 -0+08fc <[^>]*> 410d7030 mftr t5,t6,1,0,1 -0+0900 <[^>]*> 410d7031 mftr t5,t6,1,1,1 -0+0904 <[^>]*> 410d7032 mfthc1 t6,\$f13 -0+0908 <[^>]*> 410d7033 mftr t5,t6,1,3,1 -0+090c <[^>]*> 410d7034 mfthc2 t6,\$13 -0+0910 <[^>]*> 410d7035 mftr t5,t6,1,5,1 -0+0914 <[^>]*> 410d7036 mftr t5,t6,1,6,1 -0+0918 <[^>]*> 410d7037 mftr t5,t6,1,7,1 -0+091c <[^>]*> 410d7020 mftgpr t6,t5 -0+0920 <[^>]*> 410d7021 mfthi t6,\$ac3 -0+0924 <[^>]*> 410d7022 mftc1 t6,\$f13 -0+0928 <[^>]*> 410d7023 cftc1 t6,\$13 -0+092c <[^>]*> 410d7024 mftc2 t6,\$13 -0+0930 <[^>]*> 410d7025 cftc2 t6,\$13 -0+0934 <[^>]*> 410d7026 mftr t5,t6,1,6,0 -0+0938 <[^>]*> 410d7027 mftr t5,t6,1,7,0 -0+093c <[^>]*> 410d7010 mftr t5,t6,0,0,1 -0+0940 <[^>]*> 410d7011 mftr t5,t6,0,1,1 -0+0944 <[^>]*> 410d7012 mftr t5,t6,0,2,1 -0+0948 <[^>]*> 410d7013 mftr t5,t6,0,3,1 -0+094c <[^>]*> 410d7014 mftr t5,t6,0,4,1 -0+0950 <[^>]*> 410d7015 mftr t5,t6,0,5,1 -0+0954 <[^>]*> 410d7016 mftr t5,t6,0,6,1 -0+0958 <[^>]*> 410d7017 mftr t5,t6,0,7,1 -0+095c <[^>]*> 410d7000 mftc0 t6,c0_cause -0+0960 <[^>]*> 410d7001 mftc0 t6,\$13,1 -0+0964 <[^>]*> 410d7002 mftc0 t6,\$13,2 -0+0968 <[^>]*> 410d7003 mftc0 t6,\$13,3 -0+096c <[^>]*> 410d7004 mftc0 t6,\$13,4 -0+0970 <[^>]*> 410d7005 mftc0 t6,\$13,5 -0+0974 <[^>]*> 410d7006 mftc0 t6,\$13,6 -0+0978 <[^>]*> 410d7007 mftc0 t6,\$13,7 -0+097c <[^>]*> 410d7010 mftr t5,t6,0,0,1 -0+0980 <[^>]*> 410d7011 mftr t5,t6,0,1,1 -0+0984 <[^>]*> 410d7012 mftr t5,t6,0,2,1 -0+0988 <[^>]*> 410d7013 mftr t5,t6,0,3,1 -0+098c <[^>]*> 410d7014 mftr t5,t6,0,4,1 -0+0990 <[^>]*> 410d7015 mftr t5,t6,0,5,1 -0+0994 <[^>]*> 410d7016 mftr t5,t6,0,6,1 -0+0998 <[^>]*> 410d7017 mftr t5,t6,0,7,1 -0+099c <[^>]*> 410d7000 mftc0 t6,c0_cause -0+09a0 <[^>]*> 410d7001 mftc0 t6,\$13,1 -0+09a4 <[^>]*> 410d7002 mftc0 t6,\$13,2 -0+09a8 <[^>]*> 410d7003 mftc0 t6,\$13,3 -0+09ac <[^>]*> 410d7004 mftc0 t6,\$13,4 -0+09b0 <[^>]*> 410d7005 mftc0 t6,\$13,5 -0+09b4 <[^>]*> 410d7006 mftc0 t6,\$13,6 -0+09b8 <[^>]*> 410d7007 mftc0 t6,\$13,7 -0+09bc <[^>]*> 410d7030 mftr t5,t6,1,0,1 -0+09c0 <[^>]*> 410d7031 mftr t5,t6,1,1,1 -0+09c4 <[^>]*> 410d7032 mfthc1 t6,\$f13 -0+09c8 <[^>]*> 410d7033 mftr t5,t6,1,3,1 -0+09cc <[^>]*> 410d7034 mfthc2 t6,\$13 -0+09d0 <[^>]*> 410d7035 mftr t5,t6,1,5,1 -0+09d4 <[^>]*> 410d7036 mftr t5,t6,1,6,1 -0+09d8 <[^>]*> 410d7037 mftr t5,t6,1,7,1 -0+09dc <[^>]*> 410d7020 mftgpr t6,t5 -0+09e0 <[^>]*> 410d7021 mfthi t6,\$ac3 -0+09e4 <[^>]*> 410d7022 mftc1 t6,\$f13 -0+09e8 <[^>]*> 410d7023 cftc1 t6,\$13 -0+09ec <[^>]*> 410d7024 mftc2 t6,\$13 -0+09f0 <[^>]*> 410d7025 cftc2 t6,\$13 -0+09f4 <[^>]*> 410d7026 mftr t5,t6,1,6,0 -0+09f8 <[^>]*> 410d7027 mftr t5,t6,1,7,0 -0+09fc <[^>]*> 410d7030 mftr t5,t6,1,0,1 -0+0a00 <[^>]*> 410d7031 mftr t5,t6,1,1,1 -0+0a04 <[^>]*> 410d7032 mfthc1 t6,\$f13 -0+0a08 <[^>]*> 410d7033 mftr t5,t6,1,3,1 -0+0a0c <[^>]*> 410d7034 mfthc2 t6,\$13 -0+0a10 <[^>]*> 410d7035 mftr t5,t6,1,5,1 -0+0a14 <[^>]*> 410d7036 mftr t5,t6,1,6,1 -0+0a18 <[^>]*> 410d7037 mftr t5,t6,1,7,1 -0+0a1c <[^>]*> 410d7020 mftgpr t6,t5 -0+0a20 <[^>]*> 410d7021 mfthi t6,\$ac3 -0+0a24 <[^>]*> 410d7022 mftc1 t6,\$f13 -0+0a28 <[^>]*> 410d7023 cftc1 t6,\$13 -0+0a2c <[^>]*> 410d7024 mftc2 t6,\$13 -0+0a30 <[^>]*> 410d7025 cftc2 t6,\$13 -0+0a34 <[^>]*> 410d7026 mftr t5,t6,1,6,0 -0+0a38 <[^>]*> 410d7027 mftr t5,t6,1,7,0 -0+0a3c <[^>]*> 410d7010 mftr t5,t6,0,0,1 -0+0a40 <[^>]*> 410d7011 mftr t5,t6,0,1,1 -0+0a44 <[^>]*> 410d7012 mftr t5,t6,0,2,1 -0+0a48 <[^>]*> 410d7013 mftr t5,t6,0,3,1 -0+0a4c <[^>]*> 410d7014 mftr t5,t6,0,4,1 -0+0a50 <[^>]*> 410d7015 mftr t5,t6,0,5,1 -0+0a54 <[^>]*> 410d7016 mftr t5,t6,0,6,1 -0+0a58 <[^>]*> 410d7017 mftr t5,t6,0,7,1 -0+0a5c <[^>]*> 410d7000 mftc0 t6,c0_cause -0+0a60 <[^>]*> 410d7001 mftc0 t6,\$13,1 -0+0a64 <[^>]*> 410d7002 mftc0 t6,\$13,2 -0+0a68 <[^>]*> 410d7003 mftc0 t6,\$13,3 -0+0a6c <[^>]*> 410d7004 mftc0 t6,\$13,4 -0+0a70 <[^>]*> 410d7005 mftc0 t6,\$13,5 -0+0a74 <[^>]*> 410d7006 mftc0 t6,\$13,6 -0+0a78 <[^>]*> 410d7007 mftc0 t6,\$13,7 -0+0a7c <[^>]*> 410d7010 mftr t5,t6,0,0,1 -0+0a80 <[^>]*> 410d7011 mftr t5,t6,0,1,1 -0+0a84 <[^>]*> 410d7012 mftr t5,t6,0,2,1 -0+0a88 <[^>]*> 410d7013 mftr t5,t6,0,3,1 -0+0a8c <[^>]*> 410d7014 mftr t5,t6,0,4,1 -0+0a90 <[^>]*> 410d7015 mftr t5,t6,0,5,1 -0+0a94 <[^>]*> 410d7016 mftr t5,t6,0,6,1 -0+0a98 <[^>]*> 410d7017 mftr t5,t6,0,7,1 -0+0a9c <[^>]*> 410d7000 mftc0 t6,c0_cause -0+0aa0 <[^>]*> 410d7001 mftc0 t6,\$13,1 -0+0aa4 <[^>]*> 410d7002 mftc0 t6,\$13,2 -0+0aa8 <[^>]*> 410d7003 mftc0 t6,\$13,3 -0+0aac <[^>]*> 410d7004 mftc0 t6,\$13,4 -0+0ab0 <[^>]*> 410d7005 mftc0 t6,\$13,5 -0+0ab4 <[^>]*> 410d7006 mftc0 t6,\$13,6 -0+0ab8 <[^>]*> 410d7007 mftc0 t6,\$13,7 +0+08bc <[^>]*> 410e6830 mftr t5,t6,1,0,1 +0+08c0 <[^>]*> 410e6831 mftr t5,t6,1,1,1 +0+08c4 <[^>]*> 410e6832 mfthc1 t5,\$f14 +0+08c8 <[^>]*> 410e6833 mftr t5,t6,1,3,1 +0+08cc <[^>]*> 410e6834 mfthc2 t5,\$14 +0+08d0 <[^>]*> 410e6835 mftr t5,t6,1,5,1 +0+08d4 <[^>]*> 410e6836 mftr t5,t6,1,6,1 +0+08d8 <[^>]*> 410e6837 mftr t5,t6,1,7,1 +0+08dc <[^>]*> 410e6820 mftgpr t5,t6 +0+08e0 <[^>]*> 410e6821 mftacx t5,\$ac3 +0+08e4 <[^>]*> 410e6822 mftc1 t5,\$f14 +0+08e8 <[^>]*> 410e6823 cftc1 t5,\$14 +0+08ec <[^>]*> 410e6824 mftc2 t5,\$14 +0+08f0 <[^>]*> 410e6825 cftc2 t5,\$14 +0+08f4 <[^>]*> 410e6826 mftr t5,t6,1,6,0 +0+08f8 <[^>]*> 410e6827 mftr t5,t6,1,7,0 +0+08fc <[^>]*> 410e6830 mftr t5,t6,1,0,1 +0+0900 <[^>]*> 410e6831 mftr t5,t6,1,1,1 +0+0904 <[^>]*> 410e6832 mfthc1 t5,\$f14 +0+0908 <[^>]*> 410e6833 mftr t5,t6,1,3,1 +0+090c <[^>]*> 410e6834 mfthc2 t5,\$14 +0+0910 <[^>]*> 410e6835 mftr t5,t6,1,5,1 +0+0914 <[^>]*> 410e6836 mftr t5,t6,1,6,1 +0+0918 <[^>]*> 410e6837 mftr t5,t6,1,7,1 +0+091c <[^>]*> 410e6820 mftgpr t5,t6 +0+0920 <[^>]*> 410e6821 mftacx t5,\$ac3 +0+0924 <[^>]*> 410e6822 mftc1 t5,\$f14 +0+0928 <[^>]*> 410e6823 cftc1 t5,\$14 +0+092c <[^>]*> 410e6824 mftc2 t5,\$14 +0+0930 <[^>]*> 410e6825 cftc2 t5,\$14 +0+0934 <[^>]*> 410e6826 mftr t5,t6,1,6,0 +0+0938 <[^>]*> 410e6827 mftr t5,t6,1,7,0 +0+093c <[^>]*> 410e6810 mftr t5,t6,0,0,1 +0+0940 <[^>]*> 410e6811 mftr t5,t6,0,1,1 +0+0944 <[^>]*> 410e6812 mftr t5,t6,0,2,1 +0+0948 <[^>]*> 410e6813 mftr t5,t6,0,3,1 +0+094c <[^>]*> 410e6814 mftr t5,t6,0,4,1 +0+0950 <[^>]*> 410e6815 mftr t5,t6,0,5,1 +0+0954 <[^>]*> 410e6816 mftr t5,t6,0,6,1 +0+0958 <[^>]*> 410e6817 mftr t5,t6,0,7,1 +0+095c <[^>]*> 410e6800 mftc0 t5,c0_epc +0+0960 <[^>]*> 410e6801 mftc0 t5,\$14,1 +0+0964 <[^>]*> 410e6802 mftc0 t5,\$14,2 +0+0968 <[^>]*> 410e6803 mftc0 t5,\$14,3 +0+096c <[^>]*> 410e6804 mftc0 t5,\$14,4 +0+0970 <[^>]*> 410e6805 mftc0 t5,\$14,5 +0+0974 <[^>]*> 410e6806 mftc0 t5,\$14,6 +0+0978 <[^>]*> 410e6807 mftc0 t5,\$14,7 +0+097c <[^>]*> 410e6810 mftr t5,t6,0,0,1 +0+0980 <[^>]*> 410e6811 mftr t5,t6,0,1,1 +0+0984 <[^>]*> 410e6812 mftr t5,t6,0,2,1 +0+0988 <[^>]*> 410e6813 mftr t5,t6,0,3,1 +0+098c <[^>]*> 410e6814 mftr t5,t6,0,4,1 +0+0990 <[^>]*> 410e6815 mftr t5,t6,0,5,1 +0+0994 <[^>]*> 410e6816 mftr t5,t6,0,6,1 +0+0998 <[^>]*> 410e6817 mftr t5,t6,0,7,1 +0+099c <[^>]*> 410e6800 mftc0 t5,c0_epc +0+09a0 <[^>]*> 410e6801 mftc0 t5,\$14,1 +0+09a4 <[^>]*> 410e6802 mftc0 t5,\$14,2 +0+09a8 <[^>]*> 410e6803 mftc0 t5,\$14,3 +0+09ac <[^>]*> 410e6804 mftc0 t5,\$14,4 +0+09b0 <[^>]*> 410e6805 mftc0 t5,\$14,5 +0+09b4 <[^>]*> 410e6806 mftc0 t5,\$14,6 +0+09b8 <[^>]*> 410e6807 mftc0 t5,\$14,7 +0+09bc <[^>]*> 410e6830 mftr t5,t6,1,0,1 +0+09c0 <[^>]*> 410e6831 mftr t5,t6,1,1,1 +0+09c4 <[^>]*> 410e6832 mfthc1 t5,\$f14 +0+09c8 <[^>]*> 410e6833 mftr t5,t6,1,3,1 +0+09cc <[^>]*> 410e6834 mfthc2 t5,\$14 +0+09d0 <[^>]*> 410e6835 mftr t5,t6,1,5,1 +0+09d4 <[^>]*> 410e6836 mftr t5,t6,1,6,1 +0+09d8 <[^>]*> 410e6837 mftr t5,t6,1,7,1 +0+09dc <[^>]*> 410e6820 mftgpr t5,t6 +0+09e0 <[^>]*> 410e6821 mftacx t5,\$ac3 +0+09e4 <[^>]*> 410e6822 mftc1 t5,\$f14 +0+09e8 <[^>]*> 410e6823 cftc1 t5,\$14 +0+09ec <[^>]*> 410e6824 mftc2 t5,\$14 +0+09f0 <[^>]*> 410e6825 cftc2 t5,\$14 +0+09f4 <[^>]*> 410e6826 mftr t5,t6,1,6,0 +0+09f8 <[^>]*> 410e6827 mftr t5,t6,1,7,0 +0+09fc <[^>]*> 410e6830 mftr t5,t6,1,0,1 +0+0a00 <[^>]*> 410e6831 mftr t5,t6,1,1,1 +0+0a04 <[^>]*> 410e6832 mfthc1 t5,\$f14 +0+0a08 <[^>]*> 410e6833 mftr t5,t6,1,3,1 +0+0a0c <[^>]*> 410e6834 mfthc2 t5,\$14 +0+0a10 <[^>]*> 410e6835 mftr t5,t6,1,5,1 +0+0a14 <[^>]*> 410e6836 mftr t5,t6,1,6,1 +0+0a18 <[^>]*> 410e6837 mftr t5,t6,1,7,1 +0+0a1c <[^>]*> 410e6820 mftgpr t5,t6 +0+0a20 <[^>]*> 410e6821 mftacx t5,\$ac3 +0+0a24 <[^>]*> 410e6822 mftc1 t5,\$f14 +0+0a28 <[^>]*> 410e6823 cftc1 t5,\$14 +0+0a2c <[^>]*> 410e6824 mftc2 t5,\$14 +0+0a30 <[^>]*> 410e6825 cftc2 t5,\$14 +0+0a34 <[^>]*> 410e6826 mftr t5,t6,1,6,0 +0+0a38 <[^>]*> 410e6827 mftr t5,t6,1,7,0 +0+0a3c <[^>]*> 410e6810 mftr t5,t6,0,0,1 +0+0a40 <[^>]*> 410e6811 mftr t5,t6,0,1,1 +0+0a44 <[^>]*> 410e6812 mftr t5,t6,0,2,1 +0+0a48 <[^>]*> 410e6813 mftr t5,t6,0,3,1 +0+0a4c <[^>]*> 410e6814 mftr t5,t6,0,4,1 +0+0a50 <[^>]*> 410e6815 mftr t5,t6,0,5,1 +0+0a54 <[^>]*> 410e6816 mftr t5,t6,0,6,1 +0+0a58 <[^>]*> 410e6817 mftr t5,t6,0,7,1 +0+0a5c <[^>]*> 410e6800 mftc0 t5,c0_epc +0+0a60 <[^>]*> 410e6801 mftc0 t5,\$14,1 +0+0a64 <[^>]*> 410e6802 mftc0 t5,\$14,2 +0+0a68 <[^>]*> 410e6803 mftc0 t5,\$14,3 +0+0a6c <[^>]*> 410e6804 mftc0 t5,\$14,4 +0+0a70 <[^>]*> 410e6805 mftc0 t5,\$14,5 +0+0a74 <[^>]*> 410e6806 mftc0 t5,\$14,6 +0+0a78 <[^>]*> 410e6807 mftc0 t5,\$14,7 +0+0a7c <[^>]*> 410e6810 mftr t5,t6,0,0,1 +0+0a80 <[^>]*> 410e6811 mftr t5,t6,0,1,1 +0+0a84 <[^>]*> 410e6812 mftr t5,t6,0,2,1 +0+0a88 <[^>]*> 410e6813 mftr t5,t6,0,3,1 +0+0a8c <[^>]*> 410e6814 mftr t5,t6,0,4,1 +0+0a90 <[^>]*> 410e6815 mftr t5,t6,0,5,1 +0+0a94 <[^>]*> 410e6816 mftr t5,t6,0,6,1 +0+0a98 <[^>]*> 410e6817 mftr t5,t6,0,7,1 +0+0a9c <[^>]*> 410e6800 mftc0 t5,c0_epc +0+0aa0 <[^>]*> 410e6801 mftc0 t5,\$14,1 +0+0aa4 <[^>]*> 410e6802 mftc0 t5,\$14,2 +0+0aa8 <[^>]*> 410e6803 mftc0 t5,\$14,3 +0+0aac <[^>]*> 410e6804 mftc0 t5,\$14,4 +0+0ab0 <[^>]*> 410e6805 mftc0 t5,\$14,5 +0+0ab4 <[^>]*> 410e6806 mftc0 t5,\$14,6 +0+0ab8 <[^>]*> 410e6807 mftc0 t5,\$14,7 0+0abc <[^>]*> 418d7030 mttr t5,t6,1,0,1 0+0ac0 <[^>]*> 418d7031 mttr t5,t6,1,1,1 0+0ac4 <[^>]*> 418d7032 mtthc1 t5,\$f14 @@ -823,4 +823,4 @@ Disassembly of section .text: 0+0cb0 <[^>]*> 418d7005 mttc0 t5,\$14,5 0+0cb4 <[^>]*> 418d7006 mttc0 t5,\$14,6 0+0cb8 <[^>]*> 418d7007 mttc0 t5,\$14,7 - ... + \.\.\. Index: opcodes/mips-opc.c =================================================================== RCS file: /cvs/src/src/opcodes/mips-opc.c,v retrieving revision 1.55 diff -u -p -r1.55 mips-opc.c --- opcodes/mips-opc.c 30 Apr 2006 18:34:39 -0000 1.55 +++ opcodes/mips-opc.c 3 May 2006 19:15:28 -0000 @@ -787,7 +787,7 @@ const struct mips_opcode mips_builtin_op {"mfthi", "d,*", 0x41010021, 0xfff307ff, TRAP|WR_d|RD_a, 0, MT32 }, {"mftlo", "d", 0x41000021, 0xffff07ff, TRAP|WR_d|RD_a, 0, MT32 }, {"mftlo", "d,*", 0x41000021, 0xfff307ff, TRAP|WR_d|RD_a, 0, MT32 }, -{"mftr", "t,d,!,H,$", 0x41000000, 0xffe007c8, TRAP|WR_d, 0, MT32 }, +{"mftr", "d,t,!,H,$", 0x41000000, 0xffe007c8, TRAP|WR_d, 0, MT32 }, {"mfc0", "t,G", 0x40000000, 0xffe007ff, LCD|WR_t|RD_C0, 0, I1 }, {"mfc0", "t,+D", 0x40000000, 0xffe007f8, LCD|WR_t|RD_C0, 0, I32 }, {"mfc0", "t,G,H", 0x40000000, 0xffe007f8, LCD|WR_t|RD_C0, 0, I32 },