diff options
| author | iximeow <me@iximeow.net> | 2020-08-09 19:25:07 -0700 |
|---|---|---|
| committer | iximeow <me@iximeow.net> | 2020-08-09 19:25:07 -0700 |
| commit | 57ff56d8b5c3a3fa4f1d7f4881afbe2ce8e47cfd (patch) | |
| tree | 81ed40ad1545fb88933245a7b2f78f53242c4ac8 /src/long_mode | |
| parent | c06dd09585d192199f8f3068c69aecfae5d407f6 (diff) | |
support salc, get segment register numbers right
Diffstat (limited to 'src/long_mode')
| -rw-r--r-- | src/long_mode/display.rs | 4 | ||||
| -rw-r--r-- | src/long_mode/mod.rs | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/long_mode/display.rs b/src/long_mode/display.rs index 090fce2..e653399 100644 --- a/src/long_mode/display.rs +++ b/src/long_mode/display.rs @@ -125,7 +125,7 @@ const REG_NAMES: &[&'static str] = &[ "al", "cl", "dl", "bl", "spl", "bpl", "sil", "dil", "r8b", "r9b", "r10b", "r11b", "r12b", "r13b", "r14b", "r15b", "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7", "cr8", "cr9", "cr10", "cr11", "cr12", "cr13", "cr14", "cr15", "dr0", "dr1", "dr2", "dr3", "dr4", "dr5", "dr6", "dr7", "dr8", "dr9", "dr10", "dr11", "dr12", "dr13", "dr14", "dr15", - "cs", "ds", "es", "fs", "gs", "ss", "", "", + "es", "cs", "ss", "ds", "fs", "gs", "", "", "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7", "xmm8", "xmm9", "xmm10", "xmm11", "xmm12", "xmm13", "xmm14", "xmm15", "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7", "xmm8", "xmm9", "xmm10", "xmm11", "xmm12", "xmm13", "xmm14", "xmm15", "ymm0", "ymm1", "ymm2", "ymm3", "ymm4", "ymm5", "ymm6", "ymm7", "ymm8", "ymm9", "ymm10", "ymm11", "ymm12", "ymm13", "ymm14", "ymm15", @@ -1122,6 +1122,7 @@ const MNEMONICS: &[&'static str] = &[ "wrfsbase", "wrgsbase", "crc32", + "salc", "xlat", "f2xm1", @@ -1960,6 +1961,7 @@ impl <T: fmt::Write, Color: fmt::Display, Y: YaxColors<Color>> Colorize<T, Color Opcode::FCMOVNE | Opcode::FCMOVNU | Opcode::FCMOVU | + Opcode::SALC | Opcode::SETO | Opcode::SETNO | Opcode::SETB | diff --git a/src/long_mode/mod.rs b/src/long_mode/mod.rs index 3fcf4ab..4d663d3 100644 --- a/src/long_mode/mod.rs +++ b/src/long_mode/mod.rs @@ -158,12 +158,12 @@ impl RegSpec { #[inline] pub fn fs() -> RegSpec { - RegSpec { bank: RegisterBank::S, num: 3 } + RegSpec { bank: RegisterBank::S, num: 4 } } #[inline] pub fn gs() -> RegSpec { - RegSpec { bank: RegisterBank::S, num: 4 } + RegSpec { bank: RegisterBank::S, num: 5 } } #[inline] @@ -1450,6 +1450,7 @@ pub enum Opcode { WRGSBASE, CRC32, + SALC, XLAT, F2XM1, @@ -5200,7 +5201,7 @@ const OPCODES: [OpcodeRecord; 256] = [ OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::ModRM_0xd3_Ev_CL), OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing), OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing), - OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing), + OpcodeRecord(Interpretation::Instruction(Opcode::SALC), OperandCode::Nothing), // XLAT OpcodeRecord(Interpretation::Instruction(Opcode::XLAT), OperandCode::Nothing), // x86 d8 |