diff options
| author | Ronald G. Minnich <rminnich@gmail.com> | 2004-11-28 04:39:45 +0000 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2004-11-28 04:39:45 +0000 |
| commit | 284c27f29971326bd786e89c1ceb3f51a53203db (patch) | |
| tree | f33b9ced0942a0fcb3f815730761adc22cf5142f /util/vgabios | |
| parent | 637b6998650619252b89e29f2add0167780e70db (diff) | |
fixes to make adl855pc compile.
fixes to emulator.
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1806 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/vgabios')
| -rw-r--r-- | util/vgabios/testbios.c | 6 | ||||
| -rw-r--r-- | util/vgabios/x86emu/src/x86emu/decode.c | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/util/vgabios/testbios.c b/util/vgabios/testbios.c index 891e5d2ad7..541f460588 100644 --- a/util/vgabios/testbios.c +++ b/util/vgabios/testbios.c @@ -7,6 +7,7 @@ #include <getopt.h> #define die(x) { perror(x); exit(1); } +#define warn(x) { perror(x); } #include <x86emu.h> #include "test.h" @@ -258,8 +259,9 @@ int main(int argc, char **argv) X86EMU_setupPioFuncs(&myfuncs); ioperm(0, 0x400, 1); - if (iopl(3) < 0) - die("iopl"); + if (iopl(3) < 0) { + warn("iopl failed, continuing anyway"); + } /* Emergency sync ;-) */ sync(); diff --git a/util/vgabios/x86emu/src/x86emu/decode.c b/util/vgabios/x86emu/src/x86emu/decode.c index 3844d985f9..a97edd92a6 100644 --- a/util/vgabios/x86emu/src/x86emu/decode.c +++ b/util/vgabios/x86emu/src/x86emu/decode.c @@ -669,7 +669,12 @@ u16 *decode_rm_seg_register(int reg) DECODE_PRINTF("DS"); return &M.x86.R_DS; case 4: - case 5: + DECODE_PRINTF("FS"); + return &M.x86.R_FS; + case 5: + DECODE_PRINTF("GS"); + return &M.x86.R_GS; + case 6: case 7: DECODE_PRINTF("ILLEGAL SEGREG"); |