diff --git a/common/h/registers/x86_64_regs.h b/common/h/registers/x86_64_regs.h index 4ec175d353..d8bd2d6eb7 100644 --- a/common/h/registers/x86_64_regs.h +++ b/common/h/registers/x86_64_regs.h @@ -104,6 +104,10 @@ namespace Dyninst { namespace x86_64 { const signed int BASEGS = 0x3; // G Segment register const signed int BASECS = 0x4; // Code Segment register const signed int BASEES = 0x5; // Extended data Segment register + const signed int BASEGD = 0x6; // Global Descriptor Table + const signed int BASELD = 0x7; // Local Descriptor Table + const signed int BASEID = 0X8; // Interrupt Descriptor Table + const signed int BASETR = 0x9; // Task Register /* Base IDs for each bit in RFLAGS */ const signed int CF = x86::CF; // Carry Flag @@ -239,6 +243,10 @@ namespace Dyninst { namespace x86_64 { DEF_REGISTER( gs, BASEGS | FULL | SEG | Arch_x86_64, "x86_64"); DEF_REGISTER( cs, BASECS | FULL | SEG | Arch_x86_64, "x86_64"); DEF_REGISTER( ss, BASESS | FULL | SEG | Arch_x86_64, "x86_64"); + DEF_REGISTER( gdtr, BASEGD | W_REG | SEG | Arch_x86_64, "x86_64"); + DEF_REGISTER( ldtr, BASELD | W_REG | SEG | Arch_x86_64, "x86_64"); + DEF_REGISTER( idtr, BASEID | W_REG | SEG | Arch_x86_64, "x86_64"); + DEF_REGISTER( tr, BASETR | W_REG | SEG | Arch_x86_64, "x86_64"); DEF_REGISTER( cr0, 0x0 | FULL | CTL | Arch_x86_64, "x86_64"); DEF_REGISTER( cr1, 0x1 | FULL | CTL | Arch_x86_64, "x86_64"); diff --git a/common/h/registers/x86_regs.h b/common/h/registers/x86_regs.h index 0d5d2f9f9b..d8d3ad117b 100644 --- a/common/h/registers/x86_regs.h +++ b/common/h/registers/x86_regs.h @@ -99,6 +99,10 @@ namespace Dyninst { namespace x86 { const signed int BASEGS = 0x3; // G Segment register const signed int BASECS = 0x4; // Code Segment register const signed int BASEES = 0x5; // Extended data Segment register + const signed int BASEGD = 0x6; // Global Descriptor Table + const signed int BASELD = 0x7; // Local Descriptor Table + const signed int BASEID = 0X8; // Interrupt Descriptor Table + const signed int BASETR = 0x9; // Task Register /* Base IDs for each bit in EFLAGS */ const signed int CF = 0x00; // Carry Flag @@ -169,6 +173,10 @@ namespace Dyninst { namespace x86 { DEF_REGISTER( ss, BASESS | W_REG | SEG | Arch_x86, "x86"); DEF_REGISTER( fs, BASEFS | W_REG | SEG | Arch_x86, "x86"); DEF_REGISTER( gs, BASEGS | W_REG | SEG | Arch_x86, "x86"); + DEF_REGISTER( gdtr, BASEGD | W_REG | SEG | Arch_x86, "x86"); + DEF_REGISTER( ldtr, BASELD | W_REG | SEG | Arch_x86, "x86"); + DEF_REGISTER( idtr, BASEID | W_REG | SEG | Arch_x86, "x86"); + DEF_REGISTER( tr, BASETR | W_REG | SEG | Arch_x86, "x86"); DEF_REGISTER( flags, FLAGS | FULL | FLAG | Arch_x86, "x86"); DEF_REGISTER( cf, CF | BIT | FLAG | Arch_x86, "x86"); diff --git a/common/src/registers/MachRegister.C b/common/src/registers/MachRegister.C index 6f3a4aa25a..9b3656b529 100644 --- a/common/src/registers/MachRegister.C +++ b/common/src/registers/MachRegister.C @@ -1110,8 +1110,8 @@ namespace Dyninst { case 45: return Dyninst::x86::gs; case 46: return Dyninst::InvalidReg; case 47: return Dyninst::InvalidReg; -// case 48: return Dyninst::x86::tr; -// case 49: return Dyninst::x86::ldtr; + case 48: return Dyninst::x86::tr; + case 49: return Dyninst::x86::ldtr; case 50: return Dyninst::InvalidReg; case 51: return Dyninst::InvalidReg; case 52: return Dyninst::InvalidReg; @@ -1174,79 +1174,81 @@ namespace Dyninst { case 1037: return Dyninst::x86::bp; case 1038: return Dyninst::x86::si; case 1039: return Dyninst::x86::di; - case 1040: return Dyninst::x86::cf; - case 1041: return Dyninst::x86::flag1; - case 1042: return Dyninst::x86::pf; - case 1043: return Dyninst::x86::flag3; - case 1044: return Dyninst::x86::af; - case 1045: return Dyninst::x86::flag5; - case 1046: return Dyninst::x86::zf; - case 1047: return Dyninst::x86::sf; - case 1048: return Dyninst::x86::tf; - case 1049: return Dyninst::x86::if_; - case 1050: return Dyninst::x86::df; - case 1051: return Dyninst::x86::of; - case 1052: return Dyninst::x86::flagc; - case 1053: return Dyninst::x86::flagd; - case 1054: return Dyninst::x86::nt_; - case 1055: return Dyninst::x86::flagf; - case 1056: return Dyninst::x86::rf; - case 1057: return Dyninst::x86::vm; - case 1058: return Dyninst::x86::ac; - case 1059: return Dyninst::x86::vif; - case 1060: return Dyninst::x86::vip; - case 1061: return Dyninst::x86::id; - case 1062: return Dyninst::x86::cr0; - case 1063: return Dyninst::x86::cr1; - case 1064: return Dyninst::x86::cr2; - case 1065: return Dyninst::x86::cr3; - case 1066: return Dyninst::x86::cr4; - case 1067: return Dyninst::x86::cr5; - case 1068: return Dyninst::x86::cr6; - case 1069: return Dyninst::x86::cr7; - case 1070: return Dyninst::x86::dr0; - case 1071: return Dyninst::x86::dr1; - case 1072: return Dyninst::x86::dr2; - case 1073: return Dyninst::x86::dr3; - case 1074: return Dyninst::x86::dr4; - case 1075: return Dyninst::x86::dr5; - case 1076: return Dyninst::x86::dr6; - case 1077: return Dyninst::x86::dr7; - case 1078: return Dyninst::x86::ymm0; - case 1079: return Dyninst::x86::ymm1; - case 1080: return Dyninst::x86::ymm2; - case 1081: return Dyninst::x86::ymm3; - case 1082: return Dyninst::x86::ymm4; - case 1083: return Dyninst::x86::ymm5; - case 1084: return Dyninst::x86::ymm6; - case 1085: return Dyninst::x86::ymm7; - case 1086: return Dyninst::x86::zmm0; - case 1087: return Dyninst::x86::zmm1; - case 1088: return Dyninst::x86::zmm2; - case 1089: return Dyninst::x86::zmm3; - case 1090: return Dyninst::x86::zmm4; - case 1091: return Dyninst::x86::zmm5; - case 1092: return Dyninst::x86::zmm6; - case 1093: return Dyninst::x86::zmm7; - case 1094: return Dyninst::x86::k0; - case 1095: return Dyninst::x86::k1; - case 1096: return Dyninst::x86::k2; - case 1097: return Dyninst::x86::k3; - case 1098: return Dyninst::x86::k4; - case 1099: return Dyninst::x86::k5; - case 1100: return Dyninst::x86::k6; - case 1101: return Dyninst::x86::k7; - case 1102: return Dyninst::x86::oeax; - case 1103: return Dyninst::x86::fsbase; - case 1104: return Dyninst::x86::gsbase; - case 1105: return Dyninst::x86::tr0; - case 1106: return Dyninst::x86::tr1; - case 1107: return Dyninst::x86::tr2; - case 1108: return Dyninst::x86::tr3; - case 1109: return Dyninst::x86::tr4; - case 1110: return Dyninst::x86::tr5; - case 1111: return Dyninst::x86::tr6; - case 1112: return Dyninst::x86::tr7; + case 1040: return Dyninst::x86::gdtr; + case 1041: return Dyninst::x86::idtr; + case 1042: return Dyninst::x86::cf; + case 1043: return Dyninst::x86::flag1; + case 1044: return Dyninst::x86::pf; + case 1045: return Dyninst::x86::flag3; + case 1046: return Dyninst::x86::af; + case 1047: return Dyninst::x86::flag5; + case 1048: return Dyninst::x86::zf; + case 1049: return Dyninst::x86::sf; + case 1050: return Dyninst::x86::tf; + case 1051: return Dyninst::x86::if_; + case 1052: return Dyninst::x86::df; + case 1053: return Dyninst::x86::of; + case 1054: return Dyninst::x86::flagc; + case 1055: return Dyninst::x86::flagd; + case 1056: return Dyninst::x86::nt_; + case 1057: return Dyninst::x86::flagf; + case 1058: return Dyninst::x86::rf; + case 1059: return Dyninst::x86::vm; + case 1060: return Dyninst::x86::ac; + case 1061: return Dyninst::x86::vif; + case 1062: return Dyninst::x86::vip; + case 1063: return Dyninst::x86::id; + case 1064: return Dyninst::x86::cr0; + case 1065: return Dyninst::x86::cr1; + case 1066: return Dyninst::x86::cr2; + case 1067: return Dyninst::x86::cr3; + case 1068: return Dyninst::x86::cr4; + case 1069: return Dyninst::x86::cr5; + case 1070: return Dyninst::x86::cr6; + case 1071: return Dyninst::x86::cr7; + case 1072: return Dyninst::x86::dr0; + case 1073: return Dyninst::x86::dr1; + case 1074: return Dyninst::x86::dr2; + case 1075: return Dyninst::x86::dr3; + case 1076: return Dyninst::x86::dr4; + case 1077: return Dyninst::x86::dr5; + case 1078: return Dyninst::x86::dr6; + case 1079: return Dyninst::x86::dr7; + case 1080: return Dyninst::x86::ymm0; + case 1081: return Dyninst::x86::ymm1; + case 1082: return Dyninst::x86::ymm2; + case 1083: return Dyninst::x86::ymm3; + case 1084: return Dyninst::x86::ymm4; + case 1085: return Dyninst::x86::ymm5; + case 1086: return Dyninst::x86::ymm6; + case 1087: return Dyninst::x86::ymm7; + case 1088: return Dyninst::x86::zmm0; + case 1089: return Dyninst::x86::zmm1; + case 1090: return Dyninst::x86::zmm2; + case 1091: return Dyninst::x86::zmm3; + case 1092: return Dyninst::x86::zmm4; + case 1093: return Dyninst::x86::zmm5; + case 1094: return Dyninst::x86::zmm6; + case 1095: return Dyninst::x86::zmm7; + case 1096: return Dyninst::x86::k0; + case 1097: return Dyninst::x86::k1; + case 1098: return Dyninst::x86::k2; + case 1099: return Dyninst::x86::k3; + case 1100: return Dyninst::x86::k4; + case 1101: return Dyninst::x86::k5; + case 1102: return Dyninst::x86::k6; + case 1103: return Dyninst::x86::k7; + case 1104: return Dyninst::x86::oeax; + case 1105: return Dyninst::x86::fsbase; + case 1106: return Dyninst::x86::gsbase; + case 1107: return Dyninst::x86::tr0; + case 1108: return Dyninst::x86::tr1; + case 1109: return Dyninst::x86::tr2; + case 1110: return Dyninst::x86::tr3; + case 1111: return Dyninst::x86::tr4; + case 1112: return Dyninst::x86::tr5; + case 1113: return Dyninst::x86::tr6; + case 1114: return Dyninst::x86::tr7; default: return Dyninst::InvalidReg; } break; @@ -1314,8 +1316,8 @@ namespace Dyninst { case 59: return Dyninst::x86_64::gsbase; case 60: return Dyninst::InvalidReg; case 61: return Dyninst::InvalidReg; -// case 62: return Dyninst::x86_64::tr; -// case 63: return Dyninst::x86_64::ldtr; + case 62: return Dyninst::x86_64::tr; + case 63: return Dyninst::x86_64::ldtr; // case 64: return Dyninst::x86_64::mxcsr; // case 65: return Dyninst::x86_64::fcw; // case 66: return Dyninst::x86_64::fsw; @@ -1460,95 +1462,97 @@ namespace Dyninst { case 1096: return Dyninst::x86_64::vif; case 1097: return Dyninst::x86_64::vip; case 1098: return Dyninst::x86_64::id; - case 1099: return Dyninst::x86_64::cr0; - case 1100: return Dyninst::x86_64::cr1; - case 1101: return Dyninst::x86_64::cr2; - case 1102: return Dyninst::x86_64::cr3; - case 1103: return Dyninst::x86_64::cr4; - case 1104: return Dyninst::x86_64::cr5; - case 1105: return Dyninst::x86_64::cr6; - case 1106: return Dyninst::x86_64::cr7; - case 1107: return Dyninst::x86_64::dr0; - case 1108: return Dyninst::x86_64::dr1; - case 1109: return Dyninst::x86_64::dr2; - case 1110: return Dyninst::x86_64::dr3; - case 1111: return Dyninst::x86_64::dr4; - case 1112: return Dyninst::x86_64::dr5; - case 1113: return Dyninst::x86_64::dr6; - case 1114: return Dyninst::x86_64::dr7; - case 1115: return Dyninst::x86_64::ymm0; - case 1116: return Dyninst::x86_64::ymm1; - case 1117: return Dyninst::x86_64::ymm2; - case 1118: return Dyninst::x86_64::ymm3; - case 1119: return Dyninst::x86_64::ymm4; - case 1120: return Dyninst::x86_64::ymm5; - case 1121: return Dyninst::x86_64::ymm6; - case 1122: return Dyninst::x86_64::ymm7; - case 1123: return Dyninst::x86_64::ymm8; - case 1124: return Dyninst::x86_64::ymm9; - case 1125: return Dyninst::x86_64::ymm10; - case 1126: return Dyninst::x86_64::ymm11; - case 1127: return Dyninst::x86_64::ymm12; - case 1128: return Dyninst::x86_64::ymm13; - case 1129: return Dyninst::x86_64::ymm14; - case 1130: return Dyninst::x86_64::ymm15; - case 1131: return Dyninst::x86_64::ymm16; - case 1132: return Dyninst::x86_64::ymm17; - case 1133: return Dyninst::x86_64::ymm18; - case 1134: return Dyninst::x86_64::ymm19; - case 1135: return Dyninst::x86_64::ymm20; - case 1136: return Dyninst::x86_64::ymm21; - case 1137: return Dyninst::x86_64::ymm22; - case 1138: return Dyninst::x86_64::ymm23; - case 1139: return Dyninst::x86_64::ymm24; - case 1140: return Dyninst::x86_64::ymm25; - case 1141: return Dyninst::x86_64::ymm26; - case 1142: return Dyninst::x86_64::ymm27; - case 1143: return Dyninst::x86_64::ymm28; - case 1144: return Dyninst::x86_64::ymm29; - case 1145: return Dyninst::x86_64::ymm30; - case 1146: return Dyninst::x86_64::ymm31; - case 1147: return Dyninst::x86_64::zmm0; - case 1148: return Dyninst::x86_64::zmm1; - case 1149: return Dyninst::x86_64::zmm2; - case 1150: return Dyninst::x86_64::zmm3; - case 1151: return Dyninst::x86_64::zmm4; - case 1152: return Dyninst::x86_64::zmm5; - case 1153: return Dyninst::x86_64::zmm6; - case 1154: return Dyninst::x86_64::zmm7; - case 1155: return Dyninst::x86_64::zmm8; - case 1156: return Dyninst::x86_64::zmm9; - case 1157: return Dyninst::x86_64::zmm10; - case 1158: return Dyninst::x86_64::zmm11; - case 1159: return Dyninst::x86_64::zmm12; - case 1160: return Dyninst::x86_64::zmm13; - case 1161: return Dyninst::x86_64::zmm14; - case 1162: return Dyninst::x86_64::zmm15; - case 1163: return Dyninst::x86_64::zmm16; - case 1164: return Dyninst::x86_64::zmm17; - case 1165: return Dyninst::x86_64::zmm18; - case 1166: return Dyninst::x86_64::zmm19; - case 1167: return Dyninst::x86_64::zmm20; - case 1168: return Dyninst::x86_64::zmm21; - case 1169: return Dyninst::x86_64::zmm22; - case 1170: return Dyninst::x86_64::zmm23; - case 1171: return Dyninst::x86_64::zmm24; - case 1172: return Dyninst::x86_64::zmm25; - case 1173: return Dyninst::x86_64::zmm26; - case 1174: return Dyninst::x86_64::zmm27; - case 1175: return Dyninst::x86_64::zmm28; - case 1176: return Dyninst::x86_64::zmm29; - case 1177: return Dyninst::x86_64::zmm30; - case 1178: return Dyninst::x86_64::zmm31; - case 1179: return Dyninst::x86_64::orax; - case 1180: return Dyninst::x86_64::tr0; - case 1181: return Dyninst::x86_64::tr1; - case 1182: return Dyninst::x86_64::tr2; - case 1183: return Dyninst::x86_64::tr3; - case 1184: return Dyninst::x86_64::tr4; - case 1185: return Dyninst::x86_64::tr5; - case 1186: return Dyninst::x86_64::tr6; - case 1187: return Dyninst::x86_64::tr7; + case 1099: return Dyninst::x86_64::gdtr; + case 1100: return Dyninst::x86_64::idtr; + case 1101: return Dyninst::x86_64::cr0; + case 1102: return Dyninst::x86_64::cr1; + case 1103: return Dyninst::x86_64::cr2; + case 1104: return Dyninst::x86_64::cr3; + case 1105: return Dyninst::x86_64::cr4; + case 1106: return Dyninst::x86_64::cr5; + case 1107: return Dyninst::x86_64::cr6; + case 1108: return Dyninst::x86_64::cr7; + case 1109: return Dyninst::x86_64::dr0; + case 1110: return Dyninst::x86_64::dr1; + case 1111: return Dyninst::x86_64::dr2; + case 1112: return Dyninst::x86_64::dr3; + case 1113: return Dyninst::x86_64::dr4; + case 1114: return Dyninst::x86_64::dr5; + case 1115: return Dyninst::x86_64::dr6; + case 1116: return Dyninst::x86_64::dr7; + case 1117: return Dyninst::x86_64::ymm0; + case 1118: return Dyninst::x86_64::ymm1; + case 1119: return Dyninst::x86_64::ymm2; + case 1120: return Dyninst::x86_64::ymm3; + case 1121: return Dyninst::x86_64::ymm4; + case 1122: return Dyninst::x86_64::ymm5; + case 1123: return Dyninst::x86_64::ymm6; + case 1124: return Dyninst::x86_64::ymm7; + case 1125: return Dyninst::x86_64::ymm8; + case 1126: return Dyninst::x86_64::ymm9; + case 1127: return Dyninst::x86_64::ymm10; + case 1128: return Dyninst::x86_64::ymm11; + case 1129: return Dyninst::x86_64::ymm12; + case 1130: return Dyninst::x86_64::ymm13; + case 1131: return Dyninst::x86_64::ymm14; + case 1132: return Dyninst::x86_64::ymm15; + case 1133: return Dyninst::x86_64::ymm16; + case 1134: return Dyninst::x86_64::ymm17; + case 1135: return Dyninst::x86_64::ymm18; + case 1136: return Dyninst::x86_64::ymm19; + case 1137: return Dyninst::x86_64::ymm20; + case 1138: return Dyninst::x86_64::ymm21; + case 1139: return Dyninst::x86_64::ymm22; + case 1140: return Dyninst::x86_64::ymm23; + case 1141: return Dyninst::x86_64::ymm24; + case 1142: return Dyninst::x86_64::ymm25; + case 1143: return Dyninst::x86_64::ymm26; + case 1144: return Dyninst::x86_64::ymm27; + case 1145: return Dyninst::x86_64::ymm28; + case 1146: return Dyninst::x86_64::ymm29; + case 1147: return Dyninst::x86_64::ymm30; + case 1148: return Dyninst::x86_64::ymm31; + case 1149: return Dyninst::x86_64::zmm0; + case 1150: return Dyninst::x86_64::zmm1; + case 1151: return Dyninst::x86_64::zmm2; + case 1152: return Dyninst::x86_64::zmm3; + case 1153: return Dyninst::x86_64::zmm4; + case 1154: return Dyninst::x86_64::zmm5; + case 1155: return Dyninst::x86_64::zmm6; + case 1156: return Dyninst::x86_64::zmm7; + case 1157: return Dyninst::x86_64::zmm8; + case 1158: return Dyninst::x86_64::zmm9; + case 1159: return Dyninst::x86_64::zmm10; + case 1160: return Dyninst::x86_64::zmm11; + case 1161: return Dyninst::x86_64::zmm12; + case 1162: return Dyninst::x86_64::zmm13; + case 1163: return Dyninst::x86_64::zmm14; + case 1164: return Dyninst::x86_64::zmm15; + case 1165: return Dyninst::x86_64::zmm16; + case 1166: return Dyninst::x86_64::zmm17; + case 1167: return Dyninst::x86_64::zmm18; + case 1168: return Dyninst::x86_64::zmm19; + case 1169: return Dyninst::x86_64::zmm20; + case 1170: return Dyninst::x86_64::zmm21; + case 1171: return Dyninst::x86_64::zmm22; + case 1172: return Dyninst::x86_64::zmm23; + case 1173: return Dyninst::x86_64::zmm24; + case 1174: return Dyninst::x86_64::zmm25; + case 1175: return Dyninst::x86_64::zmm26; + case 1176: return Dyninst::x86_64::zmm27; + case 1177: return Dyninst::x86_64::zmm28; + case 1178: return Dyninst::x86_64::zmm29; + case 1179: return Dyninst::x86_64::zmm30; + case 1180: return Dyninst::x86_64::zmm31; + case 1181: return Dyninst::x86_64::orax; + case 1182: return Dyninst::x86_64::tr0; + case 1183: return Dyninst::x86_64::tr1; + case 1184: return Dyninst::x86_64::tr2; + case 1185: return Dyninst::x86_64::tr3; + case 1186: return Dyninst::x86_64::tr4; + case 1187: return Dyninst::x86_64::tr5; + case 1188: return Dyninst::x86_64::tr6; + case 1189: return Dyninst::x86_64::tr7; default: return Dyninst::InvalidReg; } break; @@ -1871,8 +1875,8 @@ namespace Dyninst { case Dyninst::x86::igs: return 45; /*[46] Reserved */ /*[47] Reserved */ -// case Dyninst::x86::itr: return 48; -// case Dyninst::x86::ildtr: return 49; + case Dyninst::x86::itr: return 48; + case Dyninst::x86::ildtr: return 49; /*[50] Reserved */ /*[51] Reserved */ /*[52] Reserved */ @@ -1935,79 +1939,81 @@ namespace Dyninst { case Dyninst::x86::ibp: return 1037; case Dyninst::x86::isi: return 1038; case Dyninst::x86::idi: return 1039; - case Dyninst::x86::icf: return 1040; - case Dyninst::x86::iflag1: return 1041; - case Dyninst::x86::ipf: return 1042; - case Dyninst::x86::iflag3: return 1043; - case Dyninst::x86::iaf: return 1044; - case Dyninst::x86::iflag5: return 1045; - case Dyninst::x86::izf: return 1046; - case Dyninst::x86::isf: return 1047; - case Dyninst::x86::itf: return 1048; - case Dyninst::x86::iif_: return 1049; - case Dyninst::x86::idf: return 1050; - case Dyninst::x86::iof: return 1051; - case Dyninst::x86::iflagc: return 1052; - case Dyninst::x86::iflagd: return 1053; - case Dyninst::x86::int_: return 1054; - case Dyninst::x86::iflagf: return 1055; - case Dyninst::x86::irf: return 1056; - case Dyninst::x86::ivm: return 1057; - case Dyninst::x86::iac: return 1058; - case Dyninst::x86::ivif: return 1059; - case Dyninst::x86::ivip: return 1060; - case Dyninst::x86::iid: return 1061; - case Dyninst::x86::icr0: return 1062; - case Dyninst::x86::icr1: return 1063; - case Dyninst::x86::icr2: return 1064; - case Dyninst::x86::icr3: return 1065; - case Dyninst::x86::icr4: return 1066; - case Dyninst::x86::icr5: return 1067; - case Dyninst::x86::icr6: return 1068; - case Dyninst::x86::icr7: return 1069; - case Dyninst::x86::idr0: return 1070; - case Dyninst::x86::idr1: return 1071; - case Dyninst::x86::idr2: return 1072; - case Dyninst::x86::idr3: return 1073; - case Dyninst::x86::idr4: return 1074; - case Dyninst::x86::idr5: return 1075; - case Dyninst::x86::idr6: return 1076; - case Dyninst::x86::idr7: return 1077; - case Dyninst::x86::iymm0: return 1078; - case Dyninst::x86::iymm1: return 1079; - case Dyninst::x86::iymm2: return 1080; - case Dyninst::x86::iymm3: return 1081; - case Dyninst::x86::iymm4: return 1082; - case Dyninst::x86::iymm5: return 1083; - case Dyninst::x86::iymm6: return 1084; - case Dyninst::x86::iymm7: return 1085; - case Dyninst::x86::izmm0: return 1086; - case Dyninst::x86::izmm1: return 1087; - case Dyninst::x86::izmm2: return 1088; - case Dyninst::x86::izmm3: return 1089; - case Dyninst::x86::izmm4: return 1090; - case Dyninst::x86::izmm5: return 1091; - case Dyninst::x86::izmm6: return 1092; - case Dyninst::x86::izmm7: return 1093; - case Dyninst::x86::ik0: return 1094; - case Dyninst::x86::ik1: return 1095; - case Dyninst::x86::ik2: return 1096; - case Dyninst::x86::ik3: return 1097; - case Dyninst::x86::ik4: return 1098; - case Dyninst::x86::ik5: return 1099; - case Dyninst::x86::ik6: return 1100; - case Dyninst::x86::ik7: return 1101; - case Dyninst::x86::ioeax: return 1102; - case Dyninst::x86::ifsbase: return 1103; - case Dyninst::x86::igsbase: return 1104; - case Dyninst::x86::itr0: return 1105; - case Dyninst::x86::itr1: return 1106; - case Dyninst::x86::itr2: return 1107; - case Dyninst::x86::itr3: return 1108; - case Dyninst::x86::itr4: return 1109; - case Dyninst::x86::itr5: return 1110; - case Dyninst::x86::itr6: return 1111; - case Dyninst::x86::itr7: return 1112; + case Dyninst::x86::igdtr: return 1040; + case Dyninst::x86::iidtr: return 1041; + case Dyninst::x86::icf: return 1042; + case Dyninst::x86::iflag1: return 1043; + case Dyninst::x86::ipf: return 1044; + case Dyninst::x86::iflag3: return 1045; + case Dyninst::x86::iaf: return 1046; + case Dyninst::x86::iflag5: return 1047; + case Dyninst::x86::izf: return 1048; + case Dyninst::x86::isf: return 1049; + case Dyninst::x86::itf: return 1050; + case Dyninst::x86::iif_: return 1051; + case Dyninst::x86::idf: return 1052; + case Dyninst::x86::iof: return 1053; + case Dyninst::x86::iflagc: return 1054; + case Dyninst::x86::iflagd: return 1055; + case Dyninst::x86::int_: return 1056; + case Dyninst::x86::iflagf: return 1057; + case Dyninst::x86::irf: return 1058; + case Dyninst::x86::ivm: return 1059; + case Dyninst::x86::iac: return 1060; + case Dyninst::x86::ivif: return 1061; + case Dyninst::x86::ivip: return 1062; + case Dyninst::x86::iid: return 1063; + case Dyninst::x86::icr0: return 1064; + case Dyninst::x86::icr1: return 1065; + case Dyninst::x86::icr2: return 1066; + case Dyninst::x86::icr3: return 1067; + case Dyninst::x86::icr4: return 1068; + case Dyninst::x86::icr5: return 1069; + case Dyninst::x86::icr6: return 1070; + case Dyninst::x86::icr7: return 1071; + case Dyninst::x86::idr0: return 1072; + case Dyninst::x86::idr1: return 1073; + case Dyninst::x86::idr2: return 1074; + case Dyninst::x86::idr3: return 1075; + case Dyninst::x86::idr4: return 1076; + case Dyninst::x86::idr5: return 1077; + case Dyninst::x86::idr6: return 1078; + case Dyninst::x86::idr7: return 1079; + case Dyninst::x86::iymm0: return 1080; + case Dyninst::x86::iymm1: return 1081; + case Dyninst::x86::iymm2: return 1082; + case Dyninst::x86::iymm3: return 1083; + case Dyninst::x86::iymm4: return 1084; + case Dyninst::x86::iymm5: return 1085; + case Dyninst::x86::iymm6: return 1086; + case Dyninst::x86::iymm7: return 1087; + case Dyninst::x86::izmm0: return 1088; + case Dyninst::x86::izmm1: return 1089; + case Dyninst::x86::izmm2: return 1090; + case Dyninst::x86::izmm3: return 1091; + case Dyninst::x86::izmm4: return 1092; + case Dyninst::x86::izmm5: return 1093; + case Dyninst::x86::izmm6: return 1094; + case Dyninst::x86::izmm7: return 1095; + case Dyninst::x86::ik0: return 1096; + case Dyninst::x86::ik1: return 1097; + case Dyninst::x86::ik2: return 1098; + case Dyninst::x86::ik3: return 1099; + case Dyninst::x86::ik4: return 1100; + case Dyninst::x86::ik5: return 1101; + case Dyninst::x86::ik6: return 1102; + case Dyninst::x86::ik7: return 1103; + case Dyninst::x86::ioeax: return 1104; + case Dyninst::x86::ifsbase: return 1105; + case Dyninst::x86::igsbase: return 1106; + case Dyninst::x86::itr0: return 1107; + case Dyninst::x86::itr1: return 1108; + case Dyninst::x86::itr2: return 1109; + case Dyninst::x86::itr3: return 1110; + case Dyninst::x86::itr4: return 1111; + case Dyninst::x86::itr5: return 1112; + case Dyninst::x86::itr6: return 1113; + case Dyninst::x86::itr7: return 1114; default: return -1; } break; @@ -2075,8 +2081,8 @@ namespace Dyninst { case Dyninst::x86_64::igsbase: return 59; /*[60] Reserved */ /*[61] Reserved */ -// case Dyninst::x86_64::itr: return 62; -// case Dyninst::x86_64::ildtr: return 63; + case Dyninst::x86_64::itr: return 62; + case Dyninst::x86_64::ildtr: return 63; // case Dyninst::x86_64::imxcsr: return 64; // case Dyninst::x86_64::ifcw: return 65; // case Dyninst::x86_64::ifsw: return 66; @@ -2221,96 +2227,97 @@ namespace Dyninst { case Dyninst::x86_64::ivif: return 1096; case Dyninst::x86_64::ivip: return 1097; case Dyninst::x86_64::iid: return 1098; - case Dyninst::x86_64::icr0: return 1099; - case Dyninst::x86_64::icr1: return 1100; - case Dyninst::x86_64::icr2: return 1101; - case Dyninst::x86_64::icr3: return 1102; - case Dyninst::x86_64::icr4: return 1103; - case Dyninst::x86_64::icr5: return 1104; - case Dyninst::x86_64::icr6: return 1105; - case Dyninst::x86_64::icr7: return 1106; - case Dyninst::x86_64::idr0: return 1107; - case Dyninst::x86_64::idr1: return 1108; - case Dyninst::x86_64::idr2: return 1109; - case Dyninst::x86_64::idr3: return 1110; - case Dyninst::x86_64::idr4: return 1111; - case Dyninst::x86_64::idr5: return 1112; - case Dyninst::x86_64::idr6: return 1113; - case Dyninst::x86_64::idr7: return 1114; - case Dyninst::x86_64::iymm0: return 1115; - case Dyninst::x86_64::iymm1: return 1116; - case Dyninst::x86_64::iymm2: return 1117; - case Dyninst::x86_64::iymm3: return 1118; - case Dyninst::x86_64::iymm4: return 1119; - case Dyninst::x86_64::iymm5: return 1120; - case Dyninst::x86_64::iymm6: return 1121; - case Dyninst::x86_64::iymm7: return 1122; - case Dyninst::x86_64::iymm8: return 1123; - case Dyninst::x86_64::iymm9: return 1124; - case Dyninst::x86_64::iymm10: return 1125; - case Dyninst::x86_64::iymm11: return 1126; - case Dyninst::x86_64::iymm12: return 1127; - case Dyninst::x86_64::iymm13: return 1128; - case Dyninst::x86_64::iymm14: return 1129; - case Dyninst::x86_64::iymm15: return 1130; - case Dyninst::x86_64::iymm16: return 1131; - case Dyninst::x86_64::iymm17: return 1132; - case Dyninst::x86_64::iymm18: return 1133; - case Dyninst::x86_64::iymm19: return 1134; - case Dyninst::x86_64::iymm20: return 1135; - case Dyninst::x86_64::iymm21: return 1136; - case Dyninst::x86_64::iymm22: return 1137; - case Dyninst::x86_64::iymm23: return 1138; - case Dyninst::x86_64::iymm24: return 1139; - case Dyninst::x86_64::iymm25: return 1140; - case Dyninst::x86_64::iymm26: return 1141; - case Dyninst::x86_64::iymm27: return 1142; - case Dyninst::x86_64::iymm28: return 1143; - case Dyninst::x86_64::iymm29: return 1144; - case Dyninst::x86_64::iymm30: return 1145; - case Dyninst::x86_64::iymm31: return 1146; - case Dyninst::x86_64::izmm0: return 1147; - case Dyninst::x86_64::izmm1: return 1148; - case Dyninst::x86_64::izmm2: return 1149; - case Dyninst::x86_64::izmm3: return 1150; - case Dyninst::x86_64::izmm4: return 1151; - case Dyninst::x86_64::izmm5: return 1152; - case Dyninst::x86_64::izmm6: return 1153; - case Dyninst::x86_64::izmm7: return 1154; - case Dyninst::x86_64::izmm8: return 1155; - case Dyninst::x86_64::izmm9: return 1156; - case Dyninst::x86_64::izmm10: return 1157; - case Dyninst::x86_64::izmm11: return 1158; - case Dyninst::x86_64::izmm12: return 1159; - case Dyninst::x86_64::izmm13: return 1160; - case Dyninst::x86_64::izmm14: return 1161; - case Dyninst::x86_64::izmm15: return 1162; - case Dyninst::x86_64::izmm16: return 1163; - case Dyninst::x86_64::izmm17: return 1164; - case Dyninst::x86_64::izmm18: return 1165; - case Dyninst::x86_64::izmm19: return 1166; - case Dyninst::x86_64::izmm20: return 1167; - case Dyninst::x86_64::izmm21: return 1168; - case Dyninst::x86_64::izmm22: return 1169; - case Dyninst::x86_64::izmm23: return 1170; - case Dyninst::x86_64::izmm24: return 1171; - case Dyninst::x86_64::izmm25: return 1172; - case Dyninst::x86_64::izmm26: return 1173; - case Dyninst::x86_64::izmm27: return 1174; - case Dyninst::x86_64::izmm28: return 1175; - case Dyninst::x86_64::izmm29: return 1176; - case Dyninst::x86_64::izmm30: return 1177; - case Dyninst::x86_64::izmm31: return 1178; - case Dyninst::x86_64::iorax: return 1179; - case Dyninst::x86_64::itr0: return 1180; - case Dyninst::x86_64::itr1: return 1181; - case Dyninst::x86_64::itr2: return 1182; - case Dyninst::x86_64::itr3: return 1183; - case Dyninst::x86_64::itr4: return 1184; - case Dyninst::x86_64::itr5: return 1185; - case Dyninst::x86_64::itr6: return 1186; - case Dyninst::x86_64::itr7: return 1187; - + case Dyninst::x86_64::igdtr: return 1099; + case Dyninst::x86_64::iidtr: return 1100; + case Dyninst::x86_64::icr0: return 1101; + case Dyninst::x86_64::icr1: return 1102; + case Dyninst::x86_64::icr2: return 1103; + case Dyninst::x86_64::icr3: return 1104; + case Dyninst::x86_64::icr4: return 1105; + case Dyninst::x86_64::icr5: return 1106; + case Dyninst::x86_64::icr6: return 1107; + case Dyninst::x86_64::icr7: return 1108; + case Dyninst::x86_64::idr0: return 1109; + case Dyninst::x86_64::idr1: return 1110; + case Dyninst::x86_64::idr2: return 1111; + case Dyninst::x86_64::idr3: return 1112; + case Dyninst::x86_64::idr4: return 1113; + case Dyninst::x86_64::idr5: return 1114; + case Dyninst::x86_64::idr6: return 1115; + case Dyninst::x86_64::idr7: return 1116; + case Dyninst::x86_64::iymm0: return 1117; + case Dyninst::x86_64::iymm1: return 1118; + case Dyninst::x86_64::iymm2: return 1119; + case Dyninst::x86_64::iymm3: return 1120; + case Dyninst::x86_64::iymm4: return 1121; + case Dyninst::x86_64::iymm5: return 1122; + case Dyninst::x86_64::iymm6: return 1123; + case Dyninst::x86_64::iymm7: return 1124; + case Dyninst::x86_64::iymm8: return 1125; + case Dyninst::x86_64::iymm9: return 1126; + case Dyninst::x86_64::iymm10: return 1127; + case Dyninst::x86_64::iymm11: return 1128; + case Dyninst::x86_64::iymm12: return 1129; + case Dyninst::x86_64::iymm13: return 1130; + case Dyninst::x86_64::iymm14: return 1131; + case Dyninst::x86_64::iymm15: return 1132; + case Dyninst::x86_64::iymm16: return 1133; + case Dyninst::x86_64::iymm17: return 1134; + case Dyninst::x86_64::iymm18: return 1135; + case Dyninst::x86_64::iymm19: return 1136; + case Dyninst::x86_64::iymm20: return 1137; + case Dyninst::x86_64::iymm21: return 1138; + case Dyninst::x86_64::iymm22: return 1139; + case Dyninst::x86_64::iymm23: return 1140; + case Dyninst::x86_64::iymm24: return 1141; + case Dyninst::x86_64::iymm25: return 1142; + case Dyninst::x86_64::iymm26: return 1143; + case Dyninst::x86_64::iymm27: return 1144; + case Dyninst::x86_64::iymm28: return 1145; + case Dyninst::x86_64::iymm29: return 1146; + case Dyninst::x86_64::iymm30: return 1147; + case Dyninst::x86_64::iymm31: return 1148; + case Dyninst::x86_64::izmm0: return 1149; + case Dyninst::x86_64::izmm1: return 1150; + case Dyninst::x86_64::izmm2: return 1151; + case Dyninst::x86_64::izmm3: return 1152; + case Dyninst::x86_64::izmm4: return 1153; + case Dyninst::x86_64::izmm5: return 1154; + case Dyninst::x86_64::izmm6: return 1155; + case Dyninst::x86_64::izmm7: return 1156; + case Dyninst::x86_64::izmm8: return 1157; + case Dyninst::x86_64::izmm9: return 1158; + case Dyninst::x86_64::izmm10: return 1159; + case Dyninst::x86_64::izmm11: return 1160; + case Dyninst::x86_64::izmm12: return 1161; + case Dyninst::x86_64::izmm13: return 1162; + case Dyninst::x86_64::izmm14: return 1163; + case Dyninst::x86_64::izmm15: return 1164; + case Dyninst::x86_64::izmm16: return 1165; + case Dyninst::x86_64::izmm17: return 1166; + case Dyninst::x86_64::izmm18: return 1167; + case Dyninst::x86_64::izmm19: return 1168; + case Dyninst::x86_64::izmm20: return 1169; + case Dyninst::x86_64::izmm21: return 1170; + case Dyninst::x86_64::izmm22: return 1171; + case Dyninst::x86_64::izmm23: return 1172; + case Dyninst::x86_64::izmm24: return 1173; + case Dyninst::x86_64::izmm25: return 1174; + case Dyninst::x86_64::izmm26: return 1175; + case Dyninst::x86_64::izmm27: return 1176; + case Dyninst::x86_64::izmm28: return 1177; + case Dyninst::x86_64::izmm29: return 1178; + case Dyninst::x86_64::izmm30: return 1179; + case Dyninst::x86_64::izmm31: return 1180; + case Dyninst::x86_64::iorax: return 1181; + case Dyninst::x86_64::itr0: return 1182; + case Dyninst::x86_64::itr1: return 1183; + case Dyninst::x86_64::itr2: return 1184; + case Dyninst::x86_64::itr3: return 1185; + case Dyninst::x86_64::itr4: return 1186; + case Dyninst::x86_64::itr5: return 1187; + case Dyninst::x86_64::itr6: return 1188; + case Dyninst::x86_64::itr7: return 1189; default: return -1; } break;