diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2016-05-27 08:02:56 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2016-05-27 08:03:17 -0700 |
| commit | e92bae62606702c1c07e095789ffed103e0e34c5 (patch) | |
| tree | 65b78ae2185c0c62cb24468da9fb8740a931bf6e /opcodes/i386-opc.h | |
| parent | c185ba27ca74b02bcca8d016e2d82b09aa6df28b (diff) | |
| download | gdb-e92bae62606702c1c07e095789ffed103e0e34c5.zip gdb-e92bae62606702c1c07e095789ffed103e0e34c5.tar.gz gdb-e92bae62606702c1c07e095789ffed103e0e34c5.tar.bz2 | |
Replace CpuAMD64/CpuIntel64 with AMD64/Intel64
AMD64 vs CpuIntel64 ISA should be handled similar as AT&T vs Intel
syntax. Since cpu_flags isn't sorted by position, we need to check
the whole cpu_flags array for the maximum position when verifying
CpuMax.
gas/
PR gas/20154
* config/tc-i386.c (cpu_flags_match): Don't set cpuamd64 nor
cpuintel64.
(match_template): Check Intel64/AMD64 ISA.
opcodes/
PR gas/20154
* i386-gen.c (cpu_flags): Remove CpuAMD64 and CpuIntel64.
(opcode_modifiers): Add AMD64 and Intel64.
(main): Properly verify CpuMax.
* i386-opc.h (CpuAMD64): Removed.
(CpuIntel64): Likewise.
(CpuMax): Set to CpuNo64.
(i386_cpu_flags): Remove cpuamd64 and cpuintel64.
(AMD64): New.
(Intel64): Likewise.
(i386_opcode_modifier): Add amd64 and intel64.
(i386-opc.tbl): Replace CpuAMD64/CpuIntel64 with AMD64/Intel64
on call and jmp.
* i386-init.h: Regenerated.
* i386-tbl.h: Likewise.
Diffstat (limited to 'opcodes/i386-opc.h')
| -rw-r--r-- | opcodes/i386-opc.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/opcodes/i386-opc.h b/opcodes/i386-opc.h index 0782b1a..d01657c 100644 --- a/opcodes/i386-opc.h +++ b/opcodes/i386-opc.h @@ -206,12 +206,8 @@ enum Cpu64, /* Not supported in the 64bit mode */ CpuNo64, - /* AMD64 support required */ - CpuAMD64, - /* Intel64 support required */ - CpuIntel64, /* The last bitfield in i386_cpu_flags. */ - CpuMax = CpuIntel64 + CpuMax = CpuNo64 }; #define CpuNumOfUints \ @@ -316,8 +312,6 @@ typedef union i386_cpu_flags unsigned int cpurdpid:1; unsigned int cpu64:1; unsigned int cpuno64:1; - unsigned int cpuamd64:1; - unsigned int cpuintel64:1; #ifdef CpuUnused unsigned int unused:(CpuNumOfBits - CpuUnused); #endif @@ -558,6 +552,10 @@ enum ATTSyntax, /* Intel syntax. */ IntelSyntax, + /* AMD64. */ + AMD64, + /* Intel64. */ + Intel64, /* The last bitfield in i386_opcode_modifier. */ Opcode_Modifier_Max }; @@ -626,6 +624,8 @@ typedef struct i386_opcode_modifier unsigned int attmnemonic:1; unsigned int attsyntax:1; unsigned int intelsyntax:1; + unsigned int amd64:1; + unsigned int intel64:1; } i386_opcode_modifier; /* Position of operand_type bits. */ |