diff options
Diffstat (limited to 'opcodes')
| -rw-r--r-- | opcodes/ChangeLog | 7 | ||||
| -rw-r--r-- | opcodes/mips-formats.h | 15 | ||||
| -rw-r--r-- | opcodes/mips16-opc.c | 12 |
3 files changed, 21 insertions, 13 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 0d671055f4b..2b8a9b90dcb 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,10 @@ +2013-08-03 Richard Sandiford <rdsandiford@googlemail.com> + + * mips-formats.h (PCREL): Reorder parameters and update the definition + to match new mips_pcrel_operand layout. + (JUMP, JALX, BRANCH): Update accordingly. + * mips16-opc.c (decode_mips16_operand): Likewise. + 2013-08-01 Richard Sandiford <rdsandiford@googlemail.com> * micromips-opc.c (WR_s): Delete. diff --git a/opcodes/mips-formats.h b/opcodes/mips-formats.h index c55bb27a033..49a0623da53 100644 --- a/opcodes/mips-formats.h +++ b/opcodes/mips-formats.h @@ -91,24 +91,25 @@ return &op.root; \ } -#define PCREL(SIZE, LSB, ALIGN_LOG2, SHIFT, IS_SIGNED, INCLUDE_ISA_BIT, \ +#define PCREL(SIZE, LSB, IS_SIGNED, SHIFT, ALIGN_LOG2, INCLUDE_ISA_BIT, \ FLIP_ISA_BIT) \ { \ static const struct mips_pcrel_operand op = { \ - { OP_PCREL, SIZE, LSB }, ALIGN_LOG2, SHIFT, IS_SIGNED, \ - INCLUDE_ISA_BIT, FLIP_ISA_BIT \ + { { OP_PCREL, SIZE, LSB }, \ + (1 << ((SIZE) - (IS_SIGNED))) - 1, 0, SHIFT, TRUE }, \ + ALIGN_LOG2, INCLUDE_ISA_BIT, FLIP_ISA_BIT \ }; \ - return &op.root; \ + return &op.root.root; \ } #define JUMP(SIZE, LSB, SHIFT) \ - PCREL (SIZE, LSB, SIZE + SHIFT, SHIFT, FALSE, TRUE, FALSE) + PCREL (SIZE, LSB, FALSE, SHIFT, SIZE + SHIFT, TRUE, FALSE) #define JALX(SIZE, LSB, SHIFT) \ - PCREL (SIZE, LSB, SIZE + SHIFT, SHIFT, FALSE, TRUE, TRUE) + PCREL (SIZE, LSB, FALSE, SHIFT, SIZE + SHIFT, TRUE, TRUE) #define BRANCH(SIZE, LSB, SHIFT) \ - PCREL (SIZE, LSB, 0, SHIFT, TRUE, TRUE, FALSE) + PCREL (SIZE, LSB, TRUE, SHIFT, 0, TRUE, FALSE) #define SPECIAL(SIZE, LSB, TYPE) \ { \ diff --git a/opcodes/mips16-opc.c b/opcodes/mips16-opc.c index f3869621a87..9948741d1de 100644 --- a/opcodes/mips16-opc.c +++ b/opcodes/mips16-opc.c @@ -86,11 +86,11 @@ decode_mips16_operand (char type, bfd_boolean extended_p) case '6': SINT (16, 0); case '8': SINT (16, 0); - case 'A': PCREL (16, 0, 2, 0, TRUE, FALSE, FALSE); - case 'B': PCREL (16, 0, 3, 0, TRUE, FALSE, FALSE); + case 'A': PCREL (16, 0, TRUE, 0, 2, FALSE, FALSE); + case 'B': PCREL (16, 0, TRUE, 0, 3, FALSE, FALSE); case 'C': SINT (16, 0); case 'D': SINT (16, 0); - case 'E': PCREL (16, 0, 2, 0, TRUE, FALSE, FALSE); + case 'E': PCREL (16, 0, TRUE, 0, 2, FALSE, FALSE); case 'H': SINT (16, 0); case 'K': SINT (16, 0); case 'U': UINT (16, 0); @@ -115,11 +115,11 @@ decode_mips16_operand (char type, bfd_boolean extended_p) case '6': UINT (6, 5); case '8': UINT (8, 0); - case 'A': PCREL (8, 0, 2, 2, FALSE, FALSE, FALSE); - case 'B': PCREL (5, 0, 3, 3, FALSE, FALSE, FALSE); + case 'A': PCREL (8, 0, FALSE, 2, 2, FALSE, FALSE); + case 'B': PCREL (5, 0, FALSE, 3, 3, FALSE, FALSE); case 'C': INT_ADJ (8, 0, 255, 3, FALSE); /* (0 .. 255) << 3 */ case 'D': INT_ADJ (5, 0, 31, 3, FALSE); /* (0 .. 31) << 3 */ - case 'E': PCREL (5, 0, 2, 2, FALSE, FALSE, FALSE); + case 'E': PCREL (5, 0, FALSE, 2, 2, FALSE, FALSE); case 'H': INT_ADJ (5, 0, 31, 1, FALSE); /* (0 .. 31) << 1 */ case 'K': INT_ADJ (8, 0, 127, 3, FALSE); /* (-128 .. 127) << 3 */ case 'U': UINT (8, 0); |