aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2010-07-25 14:04:01 -0400
committerKevin O'Connor <kevin@koconnor.net>2010-07-25 14:04:01 -0400
commit0f788893a8bbad95edcdf3db5009642633dee7dc (patch)
tree7c4805b545ab5b86c82c0c5a2e01c7150af3cb51
parentaec19c9f22992944aa7d9c09ba4d5255aade3419 (diff)
downloadseabios-0f788893a8bbad95edcdf3db5009642633dee7dc.zip
seabios-0f788893a8bbad95edcdf3db5009642633dee7dc.tar.gz
seabios-0f788893a8bbad95edcdf3db5009642633dee7dc.tar.bz2
Avoid code addresses >64K in big real mode.
Kvm has some limitations with code addresses in big real mode, so avoid doing that.
-rw-r--r--src/misc.c4
-rw-r--r--src/romlayout.S2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/misc.c b/src/misc.c
index 354df87..108c332 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -156,8 +156,8 @@ u64 rombios32_gdt[] VAR16VISIBLE __aligned(8) = {
GDT_LIMIT(BUILD_BIOS_SIZE-1) | GDT_CODE | GDT_BASE(BUILD_BIOS_ADDR),
// 16 bit data segment base=0x0 limit=0xffff (SEG32_MODE16_DS)
GDT_LIMIT(0x0ffff) | GDT_DATA,
- // 16 bit code segment base=0 limit=0xffffffff (SEG32_MODE16BIG_CS)
- GDT_LIMIT(0xfffff) | GDT_CODE | GDT_G,
+ // 16 bit code segment base=0xf0000 limit=0xffffffff (SEG32_MODE16BIG_CS)
+ GDT_LIMIT(0xfffff) | GDT_CODE | GDT_G | GDT_BASE(BUILD_BIOS_ADDR),
// 16 bit data segment base=0 limit=0xffffffff (SEG32_MODE16BIG_DS)
GDT_LIMIT(0xfffff) | GDT_DATA | GDT_G,
};
diff --git a/src/romlayout.S b/src/romlayout.S
index 54e5a4d..a469596 100644
--- a/src/romlayout.S
+++ b/src/romlayout.S
@@ -105,7 +105,7 @@ transition16big:
movw %ax, %fs
movw %ax, %gs
- ljmpl $SEG32_MODE16BIG_CS, $(BUILD_BIOS_ADDR + 1f)
+ ljmpw $SEG32_MODE16BIG_CS, $1f
.code16gcc
1: