Skip to content

Commit b7338f9

Browse files
author
Stanislav Shwartsman
committed
fixes for PR comments
1 parent 62b4e75 commit b7338f9

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

bochs/cpu/cpu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5089,7 +5089,7 @@ class BX_CPU_C : public logfunctions {
50895089
#endif
50905090

50915091
#if BX_SUPPORT_FRED
5092-
BX_SMF BX_CPP_INLINE void set_CSL(unsigned new_CSL) { BX_CPU_THIS_PTR msr.ia32_fred_cfg = (BX_CPU_THIS_PTR msr.ia32_fred_cfg & ~0x3) | new_CSL; }
5092+
BX_SMF BX_CPP_INLINE void set_CSL(unsigned new_CSL) { BX_CPU_THIS_PTR msr.ia32_fred_cfg = (BX_CPU_THIS_PTR msr.ia32_fred_cfg & ~BX_CONST64(0x3)) | new_CSL; }
50935093
#endif
50945094

50955095
BX_SMF bx_address get_segment_base(unsigned seg);

bochs/cpu/fred.cc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,6 @@ void BX_CPU_C::FRED_EventDelivery(Bit8u vector, unsigned type, Bit16u error_code
152152
RSP = new_RSP;
153153
set_CSL(new_CSL);
154154

155-
#if BX_SUPPORT_CET
156-
if (ShadowStackEnabled(0)) SSP = new_SSP;
157-
#endif
158-
159155
// save state on stack
160156
// Save return state on new regular stack; memory accesses here have supervisor privilege
161157
write_new_stack_qword(new_RSP - 8, 0, 0); // first 8 bytes pushed are all zeros
@@ -166,7 +162,7 @@ void BX_CPU_C::FRED_EventDelivery(Bit8u vector, unsigned type, Bit16u error_code
166162
write_new_stack_qword(new_RSP - 48, 0, old_CS);
167163
write_new_stack_qword(new_RSP - 56, 0, old_RIP);
168164
write_new_stack_qword(new_RSP - 64, 0, error_code);
169-
new_RSP -= 64;
165+
RSP -= 64;
170166

171167
#if BX_SUPPORT_CET
172168
if (BX_CPU_THIS_PTR cr4.get_CET()) {

0 commit comments

Comments
 (0)