diff options
Diffstat (limited to 'opcodes')
| -rw-r--r-- | opcodes/ChangeLog | 8 | ||||
| -rw-r--r-- | opcodes/aarch64-asm-2.c | 13 | ||||
| -rw-r--r-- | opcodes/aarch64-dis-2.c | 37 | ||||
| -rw-r--r-- | opcodes/aarch64-tbl.h | 4 |
4 files changed, 38 insertions, 24 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 255a8c6..d69a9f5 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,11 @@ +2015-12-10 Matthew Wahab <matthew.wahab@arm.com> + + * aarch64-asm-2.c: Regenerate. + * aarch64-dis-2.c: Regenerate. + * aarch64-tbl.h (aarch64_feature_ras): New. + (RAS): New. + (aarch64_opcode_table): Add "esb". + 2015-12-09 H.J. Lu <hongjiu.lu@intel.com> * i386-dis.c (MOD_0F01_REG_5): New. diff --git a/opcodes/aarch64-asm-2.c b/opcodes/aarch64-asm-2.c index 64bc136..2d1a22b 100644 --- a/opcodes/aarch64-asm-2.c +++ b/opcodes/aarch64-asm-2.c @@ -422,6 +422,7 @@ aarch64_find_real_opcode (const aarch64_opcode *opcode) case 1004: /* movz */ value = 1004; /* --> movz. */ break; + case 1017: /* esb */ case 1016: /* sevl */ case 1015: /* sev */ case 1014: /* wfi */ @@ -431,12 +432,12 @@ aarch64_find_real_opcode (const aarch64_opcode *opcode) case 1010: /* hint */ value = 1010; /* --> hint. */ break; - case 1025: /* tlbi */ - case 1024: /* ic */ - case 1023: /* dc */ - case 1022: /* at */ - case 1021: /* sys */ - value = 1021; /* --> sys. */ + case 1026: /* tlbi */ + case 1025: /* ic */ + case 1024: /* dc */ + case 1023: /* at */ + case 1022: /* sys */ + value = 1022; /* --> sys. */ break; default: return NULL; } diff --git a/opcodes/aarch64-dis-2.c b/opcodes/aarch64-dis-2.c index 9dfa7e4..6139af3 100644 --- a/opcodes/aarch64-dis-2.c +++ b/opcodes/aarch64-dis-2.c @@ -3319,7 +3319,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 xxxxxxxxxxxxxxxxxxxxx1xx1x10x01x sysl. */ - return 1027; + return 1028; } } } @@ -3342,7 +3342,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 xxxxxxxxxxxxxxxxxxxxxxxx0110x1xx tbz. */ - return 1029; + return 1030; } } else @@ -3361,7 +3361,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 xxxxxxxxxxxxxxxxxxxxxxxx1110x1xx tbnz. */ - return 1030; + return 1031; } } } @@ -8857,15 +8857,15 @@ aarch64_find_next_opcode (const aarch64_opcode *opcode) case 794: value = 798; break; /* ldnp --> ldp. */ case 798: return NULL; /* ldp --> NULL. */ case 1009: value = 1010; break; /* msr --> hint. */ - case 1010: value = 1017; break; /* hint --> clrex. */ - case 1017: value = 1018; break; /* clrex --> dsb. */ - case 1018: value = 1019; break; /* dsb --> dmb. */ - case 1019: value = 1020; break; /* dmb --> isb. */ - case 1020: value = 1021; break; /* isb --> sys. */ - case 1021: value = 1026; break; /* sys --> msr. */ - case 1026: return NULL; /* msr --> NULL. */ - case 1027: value = 1028; break; /* sysl --> mrs. */ - case 1028: return NULL; /* mrs --> NULL. */ + case 1010: value = 1018; break; /* hint --> clrex. */ + case 1018: value = 1019; break; /* clrex --> dsb. */ + case 1019: value = 1020; break; /* dsb --> dmb. */ + case 1020: value = 1021; break; /* dmb --> isb. */ + case 1021: value = 1022; break; /* isb --> sys. */ + case 1022: value = 1027; break; /* sys --> msr. */ + case 1027: return NULL; /* msr --> NULL. */ + case 1028: value = 1029; break; /* sysl --> mrs. */ + case 1029: return NULL; /* mrs --> NULL. */ case 361: value = 362; break; /* st4 --> st1. */ case 362: value = 363; break; /* st1 --> st2. */ case 363: value = 364; break; /* st2 --> st3. */ @@ -9145,8 +9145,8 @@ aarch64_find_alias_opcode (const aarch64_opcode *opcode) case 952: value = 1001; break; /* lduminl --> stuminl. */ case 1002: value = 1003; break; /* movn --> mov. */ case 1004: value = 1005; break; /* movz --> mov. */ - case 1010: value = 1016; break; /* hint --> sevl. */ - case 1021: value = 1025; break; /* sys --> tlbi. */ + case 1010: value = 1017; break; /* hint --> esb. */ + case 1022: value = 1026; break; /* sys --> tlbi. */ default: return NULL; } @@ -9271,16 +9271,17 @@ aarch64_find_next_alias_opcode (const aarch64_opcode *opcode) case 1001: value = 952; break; /* stuminl --> lduminl. */ case 1003: value = 1002; break; /* mov --> movn. */ case 1005: value = 1004; break; /* mov --> movz. */ + case 1017: value = 1016; break; /* esb --> sevl. */ case 1016: value = 1015; break; /* sevl --> sev. */ case 1015: value = 1014; break; /* sev --> wfi. */ case 1014: value = 1013; break; /* wfi --> wfe. */ case 1013: value = 1012; break; /* wfe --> yield. */ case 1012: value = 1011; break; /* yield --> nop. */ case 1011: value = 1010; break; /* nop --> hint. */ - case 1025: value = 1024; break; /* tlbi --> ic. */ - case 1024: value = 1023; break; /* ic --> dc. */ - case 1023: value = 1022; break; /* dc --> at. */ - case 1022: value = 1021; break; /* at --> sys. */ + case 1026: value = 1025; break; /* tlbi --> ic. */ + case 1025: value = 1024; break; /* ic --> dc. */ + case 1024: value = 1023; break; /* dc --> at. */ + case 1023: value = 1022; break; /* at --> sys. */ default: return NULL; } diff --git a/opcodes/aarch64-tbl.h b/opcodes/aarch64-tbl.h index 50bbc2d..91d8dcf 100644 --- a/opcodes/aarch64-tbl.h +++ b/opcodes/aarch64-tbl.h @@ -1297,6 +1297,8 @@ static const aarch64_feature_set aarch64_feature_lor = AARCH64_FEATURE (AARCH64_FEATURE_LOR, 0); static const aarch64_feature_set aarch64_feature_rdma = AARCH64_FEATURE (AARCH64_FEATURE_RDMA, 0); +static const aarch64_feature_set aarch64_feature_ras = + AARCH64_FEATURE (AARCH64_FEATURE_RAS, 0); static const aarch64_feature_set aarch64_feature_v8_2 = AARCH64_FEATURE (AARCH64_FEATURE_V8_2, 0); static const aarch64_feature_set aarch64_feature_fp_f16 = @@ -1311,6 +1313,7 @@ static const aarch64_feature_set aarch64_feature_fp_f16 = #define LOR &aarch64_feature_lor #define RDMA &aarch64_feature_rdma #define FP_F16 &aarch64_feature_fp_f16 +#define RAS &aarch64_feature_ras #define ARMV8_2 &aarch64_feature_v8_2 struct aarch64_opcode aarch64_opcode_table[] = @@ -2456,6 +2459,7 @@ struct aarch64_opcode aarch64_opcode_table[] = {"wfi", 0xd503207f, 0xffffffff, ic_system, 0, CORE, OP0 (), {}, F_ALIAS}, {"sev", 0xd503209f, 0xffffffff, ic_system, 0, CORE, OP0 (), {}, F_ALIAS}, {"sevl", 0xd50320bf, 0xffffffff, ic_system, 0, CORE, OP0 (), {}, F_ALIAS}, + {"esb", 0xd503221f, 0xffffffff, ic_system, 0, RAS, OP0 (), {}, F_ALIAS}, {"clrex", 0xd503305f, 0xfffff0ff, ic_system, 0, CORE, OP1 (UIMM4), {}, F_OPD0_OPT | F_DEFAULT (0xF)}, {"dsb", 0xd503309f, 0xfffff0ff, ic_system, 0, CORE, OP1 (BARRIER), {}, 0}, {"dmb", 0xd50330bf, 0xfffff0ff, ic_system, 0, CORE, OP1 (BARRIER), {}, 0}, |