projects
/
bootcensus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed int86 not setting segment registers
[bootcensus]
/
src
/
boot
/
boot2.s
diff --git
a/src/boot/boot2.s
b/src/boot/boot2.s
index
2a163e1
..
f2aab01
100644
(file)
--- a/
src/boot/boot2.s
+++ b/
src/boot/boot2.s
@@
-615,16
+615,20
@@
e820_looptop:
cmp $0x534d4150, %eax
jnz e820_fail
cmp $0x534d4150, %eax
jnz e820_fail
+ # skip areas starting above 4GB as we won't be able to use them
+ cmpl $0, 4(%edi)
+ jnz e820_skip
+
+ # only care for type 1 (usable ram), otherwise ignore
+ cmpl $1, 16(%edi)
+ jnz e820_skip
+
mov buffer, %eax
mov $boot_mem_map, %esi
mov boot_mem_map_size, %ebp
# again, that's [ebp * 8 + esi]
mov %eax, (%esi,%ebp,8)
mov buffer, %eax
mov $boot_mem_map, %esi
mov boot_mem_map_size, %ebp
# again, that's [ebp * 8 + esi]
mov %eax, (%esi,%ebp,8)
- # only care for type 1 (usable ram), otherwise ignore
- cmpl $1, 16(%edi)
- jnz e820_skip
-
# skip areas with 0 size (also clamp size to 4gb)
# test high 32bits
cmpl $0, 12(%edi)
# skip areas with 0 size (also clamp size to 4gb)
# test high 32bits
cmpl $0, 12(%edi)
@@
-799,6
+803,10
@@
int86:
mov %ebp, saved_ebp
mov 12(%ebp), %esp
popal
mov %ebp, saved_ebp
mov 12(%ebp), %esp
popal
+ popfw
+ pop %es
+ pop %ds
+ # ignore fs and gs for now, don't think I'm going to need them
mov saved_esp, %esp
# call 16bit interrupt
mov saved_esp, %esp
# call 16bit interrupt
@@
-806,7
+814,9
@@
int_op: int $0
mov saved_ebp, %ebp
mov 12(%ebp), %esp
mov saved_ebp, %ebp
mov 12(%ebp), %esp
- add $34, %esp
+ add $38, %esp
+ push %ds
+ push %es
pushfw
pushal
mov saved_esp, %esp
pushfw
pushal
mov saved_esp, %esp
@@
-837,3
+847,5
@@
int_op: int $0
# buffer used by the track loader ... to load tracks.
.align 16
buffer:
# buffer used by the track loader ... to load tracks.
.align 16
buffer:
+ .global low_mem_buffer
+low_mem_buffer: