diff --git a/instrs.txt b/instrs.txt index 1e0b8a8..bbdde02 100644 --- a/instrs.txt +++ b/instrs.txt @@ -334,7 +334,10 @@ ff/6 M GP - - - PUSH DEF64 0f18/2 M GP8 - - - PREFETCH1 0f18/3 M GP8 - - - PREFETCH2 0f1f M GP - - - NOP -# 0f20, 0f21, 0f22, 0f23 are moves to/from control/debug registers +NP.0f20 MR GP CR - - MOV_C2G DEF64 +NP.0f21 MR GP DR - - MOV_D2G DEF64 +NP.0f22 RM CR GP - - MOV_G2C DEF64 +NP.0f23 RM DR GP - - MOV_G2D DEF64 0f30 NP - - - - WRMSR 0f31 NP - - - - RDTSC 0f32 NP - - - - RDMSR diff --git a/parseinstrs.py b/parseinstrs.py index ed5a203..8be83c4 100644 --- a/parseinstrs.py +++ b/parseinstrs.py @@ -95,6 +95,8 @@ OPKIND_LOOKUP = { "FPU": (0, 0, 4), "MEMZ": (0, 0, 0), "BND": (0, 0, 0), + "CR": (0, 0, 0), + "DR": (0, 0, 0), } class InstrDesc(namedtuple("InstrDesc", "mnemonic,flags,encoding")):