projects
/
pintos-anon
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
21ac7c2
)
Remove panic code.
usb
author
Ben Pfaff
<blp@cs.stanford.edu>
Sun, 30 Jan 2005 22:53:13 +0000
(22:53 +0000)
committer
Ben Pfaff
<blp@cs.stanford.edu>
Sun, 30 Jan 2005 22:53:13 +0000
(22:53 +0000)
src/threads/start.S
patch
|
blob
|
history
diff --git
a/src/threads/start.S
b/src/threads/start.S
index 4c6ed2f84a7a05c59af52d44f405d23c1c167965..e442839f5ecd6bd73a15fbb9eaf5ea709dff7086 100644
(file)
--- a/
src/threads/start.S
+++ b/
src/threads/start.S
@@
-61,7
+61,6
@@
start:
mov ah, 0x88
int 0x15
mov ah, 0x88
int 0x15
- jc panic
cli # BIOS might have enabled interrupts
add eax, 1024 # Total kB memory
cmp eax, 64 * 1024
cli # BIOS might have enabled interrupts
add eax, 1024 # Total kB memory
cmp eax, 64 * 1024
@@
-169,20
+168,3
@@
gdt:
gdtdesc:
.word 0x17 # sizeof (gdt) - 1
.long gdt + LOADER_PHYS_BASE # address gdt
gdtdesc:
.word 0x17 # sizeof (gdt) - 1
.long gdt + LOADER_PHYS_BASE # address gdt
-
-#### Fatal error.
-#### Print panicmsg (with help from the BIOS) and spin.
-
-panic: .code16 # We only panic in real mode.
- mov si, offset panicmsg
- mov ah, 0xe
- sub bh, bh
-1: lodsb
- test al, al
-2: jz 2b # Spin.
- int 0x10
- jmp 1b
-
-panicmsg:
- .ascii "Panic!"
- .byte 0