diff options
| -rw-r--r-- | gas/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/testsuite/gas/s390/esa-g5.d | 2 | ||||
| -rw-r--r-- | gas/testsuite/gas/s390/esa-g5.s | 2 | ||||
| -rw-r--r-- | opcodes/ChangeLog | 6 | ||||
| -rw-r--r-- | opcodes/s390-opc.c | 2 | ||||
| -rw-r--r-- | opcodes/s390-opc.txt | 2 |
6 files changed, 16 insertions, 3 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index f49f1f0705..b48263f631 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-02-22 DJ Delorie <dj@redhat.com> + + * gas/s390/esa-g5.s: Adjust for corrected PKA syntax. + * gas/s390/esa-g5.d: Adjust for corrected PKA syntax. + 2007-02-20 Thiemo Seufer <ths@mips.com> Chao-Ying Fu <fu@mips.com> diff --git a/gas/testsuite/gas/s390/esa-g5.d b/gas/testsuite/gas/s390/esa-g5.d index 7917ee9f7a..16021f6e93 100644 --- a/gas/testsuite/gas/s390/esa-g5.d +++ b/gas/testsuite/gas/s390/esa-g5.d @@ -341,7 +341,7 @@ Disassembly of section .text: .*: b2 18 5f ff [ ]*pc 4095\(%r5\) .*: b2 2e 00 69 [ ]*pgin %r6,%r9 .*: b2 2f 00 69 [ ]*pgout %r6,%r9 -.*: e9 ff 5f ff af ff [ ]*pka 4095\(256,%r5\),4095\(%r10\) +.*: e9 1f 5f ff af ff [ ]*pka 4095\(%r5\),4095\(32,%r10\) .*: e1 ff 5f ff af ff [ ]*pku 4095\(256,%r5\),4095\(%r10\) .*: ee 69 5f ff af ff [ ]*plo %r6,4095\(%r5\),%r9,4095\(%r10\) .*: 01 01 [ ]*pr diff --git a/gas/testsuite/gas/s390/esa-g5.s b/gas/testsuite/gas/s390/esa-g5.s index d241c21fa4..3ff0b53436 100644 --- a/gas/testsuite/gas/s390/esa-g5.s +++ b/gas/testsuite/gas/s390/esa-g5.s @@ -335,7 +335,7 @@ foo: pc 4095(%r5) pgin %r6,%r9 pgout %r6,%r9 - pka 4095(256,%r5),4095(%r10) + pka 4095(%r5),4095(32,%r10) pku 4095(256,%r5),4095(%r10) plo %r6,4095(%r5),%r9,4095(%r10) pr diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index b42099f0f9..a1be1e631c 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,9 @@ +2007-02-22 DJ Delorie <dj@redhat.com> + + * s390-opc.c (INSTR_SS_L2RDRD): New. + (MASK_SS_L2RDRD): New. + * s390-opc.txt (pka): Use it. + 2007-02-20 Thiemo Seufer <ths@mips.com> Chao-Ying Fu <fu@mips.com> diff --git a/opcodes/s390-opc.c b/opcodes/s390-opc.c index 0da63bc72d..d5913c0fe2 100644 --- a/opcodes/s390-opc.c +++ b/opcodes/s390-opc.c @@ -249,6 +249,7 @@ const struct s390_operand s390_operands[] = #define INSTR_SIY_URD 6, { D20_20,B_16,U8_8,0,0,0 } /* e.g. tmy */ #define INSTR_SSE_RDRD 6, { D_20,B_16,D_36,B_32,0,0 } /* e.g. mvsdk */ #define INSTR_SS_L0RDRD 6, { D_20,L8_8,B_16,D_36,B_32,0 } /* e.g. mvc */ +#define INSTR_SS_L2RDRD 6, { D_20,B_16,D_36,L8_8,B_32,0 } /* e.g. pka */ #define INSTR_SS_LIRDRD 6, { D_20,L4_8,B_16,D_36,B_32,U4_12 } /* e.g. srp */ #define INSTR_SS_LLRDRD 6, { D_20,L4_8,B_16,D_36,L4_12,B_32 } /* e.g. pack */ #define INSTR_SS_RRRDRD 6, { D_20,R_8,B_16,D_36,B_32,R_12 } /* e.g. mvck */ @@ -322,6 +323,7 @@ const struct s390_operand s390_operands[] = #define MASK_SIY_URD { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff } #define MASK_SSE_RDRD { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 } #define MASK_SS_L0RDRD { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 } +#define MASK_SS_L2RDRD { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 } #define MASK_SS_LIRDRD { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 } #define MASK_SS_LLRDRD { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 } #define MASK_SS_RRRDRD { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 } diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt index 56773a936a..db0ccdab54 100644 --- a/opcodes/s390-opc.txt +++ b/opcodes/s390-opc.txt @@ -428,7 +428,7 @@ a701 tmll RI_RU "test under mask low low" g5 esa,zarch b278 stcke S_RD "store clock extended" g5 esa,zarch b2a5 tre RRE_RR "translate extended" g5 esa,zarch eb000000008e mvclu RSE_RRRD "move long unicode" g5 esa,zarch -e9 pka SS_L0RDRD "pack ascii" g5 esa,zarch +e9 pka SS_L2RDRD "pack ascii" g5 esa,zarch e1 pku SS_L0RDRD "pack unicode" g5 esa,zarch b993 troo RRE_RR "translate one to one" g5 esa,zarch b992 trot RRE_RR "translate one to two" g5 esa,zarch |