projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Crossport 1.2.4.1 to main.
[pintos-anon]
/
src
/
threads
/
loader.S
diff --git
a/src/threads/loader.S
b/src/threads/loader.S
index 2bfe1a45304c8756fb1cba4b14bd30af076c6320..11ab7c9e4d1e5f2bb6ddc1753532528ae1a65681 100644
(file)
--- a/
src/threads/loader.S
+++ b/
src/threads/loader.S
@@
-119,6
+119,7
@@
start:
mov ah, 0x88
int 0x15
jc panic
+ cli # BIOS might have enabled interrupts
add eax, 1024 # Total kB memory
cmp eax, 0x10000 # Cap at 64 MB
jbe 1f
@@
-313,7
+314,7
@@
panic: .code16 # We only panic in real mode.
jmp 1b
panicmsg:
- .ascii "
Loader panic!\r\n
"
+ .ascii "
Panic!
"
.byte 0
#### Memory size in 4 kB pages.