From 6ffd1a5a557fe4544de5ecf55949bed0d4f2a2a1 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Fri, 11 Jan 2013 16:51:27 +0000 Subject: [PATCH] opcodes/metag-dis.c: Fix buffer overflow in MMOV disassembler. A buffer in the disassembler code was sized too small which caused erratic behaviour when disassembling certain instructions. opcodes/ChangeLog: 2013-01-11 Will Newton * metag-dis.c (REG_WIDTH): Increase to 64. gas/testsuite/ChangeLog: 2013-01-11 Will Newton * gas/metag/metadsp21.d: Fix expected MMOV disassembly. --- gas/testsuite/gas/metag/metadsp21.d | 12 ++++++------ opcodes/metag-dis.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gas/testsuite/gas/metag/metadsp21.d b/gas/testsuite/gas/metag/metadsp21.d index d3626e9..1b5681e 100644 --- a/gas/testsuite/gas/metag/metadsp21.d +++ b/gas/testsuite/gas/metag/metadsp21.d @@ -26203,14 +26203,14 @@ Disassembly of section \.text: .*: 03 c1 ff aa D XSDW \[D1BW\.1\+D1BWI\.1\+\+\],\[D1BR\.1\+D1BRI\.1\+\+\] .*: 19 c1 ff aa DL XSDSB \[D1BW\.1\+D1BWI\.1\+\+\],\[D1BR\.1\+D1BRI\.1\+\+\] .*: c1 03 b0 ca DB MMOVD RAM8X32,RAM8X32,RAM8X32,RAM8X32,\[D1Re0\+\+\] -.*: c1 3f b0 ca DB MMOVD RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RA,\[D1Re0\+\+\] +.*: c1 3f b0 ca DB MMOVD RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,\[D1Re0\+\+\] .*: e1 47 b0 ca DB MMOVD RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,\[A0FrP\+\+\] .*: a1 c0 b1 ca DB MMOVD RAM8X32,RAM8X32,\[D0\.7\+\+\] .*: a1 c3 b1 ca DB MMOVD RAM8X32,RAM8X32,RAM8X32,RAM8X32,\[D0\.7\+\+\] .*: a1 cf b1 ca DB MMOVD RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,\[D0\.7\+\+\] -.*: a1 ff b1 ca DB MMOVD RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RA,\[D0\.7\+\+\] +.*: a1 ff b1 ca DB MMOVD RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,\[D0\.7\+\+\] .*: e1 03 b2 ca DB MMOVD RAM8X32,RAM8X32,RAM8X32,RAM8X32,\[A0\.8\+\+\] -.*: e1 3f b2 ca DB MMOVD RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RA,\[A0\.8\+\+\] +.*: e1 3f b2 ca DB MMOVD RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,\[A0\.8\+\+\] .*: c1 07 b4 ca DB MMOVD RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,\[D1\.16\+\+\] .*: c1 00 b8 ca DB MMOVD RAM8X,RAM8X,\[D1Re0\+\+\] .*: c1 0f b8 ca DB MMOVD RAM8X,RAM8X,RAM8X,RAM8X,RAM8X,RAM8X,\[D1Re0\+\+\] @@ -26245,14 +26245,14 @@ Disassembly of section \.text: .*: c1 01 fc ca DW MMOVD RAMX,RAMX,RAMX,\[D1\.16\+\+\] .*: c1 1f fc ca DW MMOVD RAMX,RAMX,RAMX,RAMX,RAMX,RAMX,RAMX,\[D1\.16\+\+\] .*: c1 03 b0 cb DB MMOVL RAM8X32,RAM8X32,RAM8X32,RAM8X32,\[D1Re0\+\+\] -.*: c1 3f b0 cb DB MMOVL RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RA,\[D1Re0\+\+\] +.*: c1 3f b0 cb DB MMOVL RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,\[D1Re0\+\+\] .*: e1 47 b0 cb DB MMOVL RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,\[A0FrP\+\+\] .*: a1 c0 b1 cb DB MMOVL RAM8X32,RAM8X32,\[D0\.7\+\+\] .*: a1 c3 b1 cb DB MMOVL RAM8X32,RAM8X32,RAM8X32,RAM8X32,\[D0\.7\+\+\] .*: a1 cf b1 cb DB MMOVL RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,\[D0\.7\+\+\] -.*: a1 ff b1 cb DB MMOVL RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RA,\[D0\.7\+\+\] +.*: a1 ff b1 cb DB MMOVL RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,\[D0\.7\+\+\] .*: e1 03 b2 cb DB MMOVL RAM8X32,RAM8X32,RAM8X32,RAM8X32,\[A0\.8\+\+\] -.*: e1 3f b2 cb DB MMOVL RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RA,\[A0\.8\+\+\] +.*: e1 3f b2 cb DB MMOVL RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,\[A0\.8\+\+\] .*: c1 07 b4 cb DB MMOVL RAM8X32,RAM8X32,RAM8X32,RAM8X32,RAM8X32,\[D1\.16\+\+\] .*: c1 00 b8 cb DB MMOVL RAM8X,RAM8X,\[D1Re0\+\+\] .*: c1 0f b8 cb DB MMOVL RAM8X,RAM8X,RAM8X,RAM8X,RAM8X,RAM8X,\[D1Re0\+\+\] diff --git a/opcodes/metag-dis.c b/opcodes/metag-dis.c index 8a03a92..447f6de 100644 --- a/opcodes/metag-dis.c +++ b/opcodes/metag-dis.c @@ -33,7 +33,7 @@ #define OPERAND_WIDTH 92 #define ADDR_WIDTH 20 -#define REG_WIDTH 50 +#define REG_WIDTH 64 #define DSP_PREFIX_WIDTH 17 /* Value to print if we fail to parse a register name. */ -- 1.7.1