Skip to content

Commit 8f286f9

Browse files
committed
new registers view for eflags and segment registers
1 parent 255799c commit 8f286f9

File tree

1 file changed

+23
-21
lines changed

1 file changed

+23
-21
lines changed

x64_dbg_gui/Project/Src/Gui/RegistersView.cpp

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -156,47 +156,49 @@ RegistersView::RegistersView(QWidget* parent) : QAbstractScrollArea(parent), mVS
156156
mRegisterPlaces.insert(PF, Register_Position(offset + 1, 0, 3, 1));
157157
mRegisterMapping.insert(AF, "AF");
158158
mRegisterPlaces.insert(AF, Register_Position(offset + 2, 0, 3, 1));
159+
159160
mRegisterMapping.insert(ZF, "ZF");
160-
mRegisterPlaces.insert(ZF, Register_Position(offset + 3, 0, 3, 1));
161+
mRegisterPlaces.insert(ZF, Register_Position(offset + 0, 6, 3, 1));
161162
mRegisterMapping.insert(SF, "SF");
162-
mRegisterPlaces.insert(SF, Register_Position(offset + 4, 0, 3, 1));
163-
163+
mRegisterPlaces.insert(SF, Register_Position(offset + 1, 6, 3, 1));
164164
mRegisterMapping.insert(TF, "TF");
165-
mRegisterPlaces.insert(TF, Register_Position(offset + 0, 10, 3, 1));
165+
mRegisterPlaces.insert(TF, Register_Position(offset + 2, 6, 3, 1));
166+
166167
mRegisterMapping.insert(IF, "IF");
167-
mRegisterPlaces.insert(IF, Register_Position(offset + 1, 10, 3, 1));
168+
mRegisterPlaces.insert(IF, Register_Position(offset + 0, 12, 3, 1));
168169
mRegisterMapping.insert(DF, "DF");
169-
mRegisterPlaces.insert(DF, Register_Position(offset + 2, 10, 3, 1));
170+
mRegisterPlaces.insert(DF, Register_Position(offset + 1, 12, 3, 1));
170171
mRegisterMapping.insert(OF, "OF");
171-
mRegisterPlaces.insert(OF, Register_Position(offset + 3, 10, 3, 1));
172+
mRegisterPlaces.insert(OF, Register_Position(offset + 2, 12, 3, 1));
172173

173174
offset++;
174175
mRegisterMapping.insert(GS, "GS");
175-
mRegisterPlaces.insert(GS, Register_Position(offset + 5, 0, 3, 4));
176-
mRegisterMapping.insert(FS, "FS");
177-
mRegisterPlaces.insert(FS, Register_Position(offset + 6, 0, 3, 4));
176+
mRegisterPlaces.insert(GS, Register_Position(offset + 3, 0, 3, 4));
178177
mRegisterMapping.insert(ES, "ES");
179-
mRegisterPlaces.insert(ES, Register_Position(offset + 7, 0, 3, 4));
180-
mRegisterMapping.insert(DS, "DS");
181-
mRegisterPlaces.insert(DS, Register_Position(offset + 8, 0, 3, 4));
178+
mRegisterPlaces.insert(ES, Register_Position(offset + 4, 0, 3, 4));
182179
mRegisterMapping.insert(CS, "CS");
183-
mRegisterPlaces.insert(CS, Register_Position(offset + 9, 0, 3, 4));
180+
mRegisterPlaces.insert(CS, Register_Position(offset + 5, 0, 3, 4));
181+
182+
mRegisterMapping.insert(FS, "FS");
183+
mRegisterPlaces.insert(FS, Register_Position(offset + 3, 9, 3, 4));
184+
mRegisterMapping.insert(DS, "DS");
185+
mRegisterPlaces.insert(DS, Register_Position(offset + 4, 9, 3, 4));
184186
mRegisterMapping.insert(SS, "SS");
185-
mRegisterPlaces.insert(SS, Register_Position(offset + 10, 0, 3, 4));
187+
mRegisterPlaces.insert(SS, Register_Position(offset + 5, 9, 3, 4));
186188

187189
offset++;
188190
mRegisterMapping.insert(DR0, "DR0");
189-
mRegisterPlaces.insert(DR0, Register_Position(offset + 11, 0, 4, sizeof(uint_t) * 2));
191+
mRegisterPlaces.insert(DR0, Register_Position(offset + 6, 0, 4, sizeof(uint_t) * 2));
190192
mRegisterMapping.insert(DR1, "DR1");
191-
mRegisterPlaces.insert(DR1, Register_Position(offset + 12, 0, 4, sizeof(uint_t) * 2));
193+
mRegisterPlaces.insert(DR1, Register_Position(offset + 7, 0, 4, sizeof(uint_t) * 2));
192194
mRegisterMapping.insert(DR2, "DR2");
193-
mRegisterPlaces.insert(DR2, Register_Position(offset + 13, 0, 4, sizeof(uint_t) * 2));
195+
mRegisterPlaces.insert(DR2, Register_Position(offset + 8, 0, 4, sizeof(uint_t) * 2));
194196
mRegisterMapping.insert(DR3, "DR3");
195-
mRegisterPlaces.insert(DR3, Register_Position(offset + 14, 0, 4, sizeof(uint_t) * 2));
197+
mRegisterPlaces.insert(DR3, Register_Position(offset + 9, 0, 4, sizeof(uint_t) * 2));
196198
mRegisterMapping.insert(DR6, "DR6");
197-
mRegisterPlaces.insert(DR6, Register_Position(offset + 15, 0, 4, sizeof(uint_t) * 2));
199+
mRegisterPlaces.insert(DR6, Register_Position(offset + 10, 0, 4, sizeof(uint_t) * 2));
198200
mRegisterMapping.insert(DR7, "DR7");
199-
mRegisterPlaces.insert(DR7, Register_Position(offset + 16, 0, 4, sizeof(uint_t) * 2));
201+
mRegisterPlaces.insert(DR7, Register_Position(offset + 11, 0, 4, sizeof(uint_t) * 2));
200202

201203
fontsUpdatedSlot();
202204
connect(Config(), SIGNAL(fontsUpdated()), this, SLOT(fontsUpdatedSlot()));

0 commit comments

Comments
 (0)