Skip to content

Commit 49432df

Browse files
committed
entry.asm: fix int 24h stack changes to ensure interrupt lockout (#213)
1 parent 330d420 commit 49432df

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

kernel/entry.asm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -646,8 +646,8 @@ CritErr05:
646646
;
647647
; switch to user's stack
648648
;
649-
mov ss,[es:PSP_USERSS]
650649
mov bp,[es:PSP_USERSP]
650+
mov ss,[es:PSP_USERSS]
651651
RestoreSP
652652
Restore386Registers
653653
mov bp,cx
@@ -747,9 +747,9 @@ CritErrAbort:
747747
mov al,FAIL
748748
jz CritErrExit
749749
cli
750-
mov bp,word [_user_r+2] ;Get frame
751-
mov ss,bp
750+
mov ax,word [_user_r+2] ;Get frame
752751
mov bp,word [_user_r]
752+
mov ss,ax
753753
mov sp,bp
754754
mov byte [_ErrorMode],1 ; flag abort
755755
mov ax,4C00h

0 commit comments

Comments
 (0)