GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86emu: Respect the LEA 67h address size prefix 

From
http://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/x86emu?id=f57bc0ede8e018c7e264b917927c42a018cd1d5a

Change-Id: Ibdcaa27e936464cec512edb46447aa6284a34975
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Signed-off-by: Christian Zander <chzander@nvidia.com>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-on: http://review.coreboot.org/1364
Tested-by: build bot (Jenkins)
Reviewed-by: Anton Kochkov <anton.kochkov@gmail.com>
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
Stefan Reinauer 2012-07-26 15:40:06 -07:00 committed by Patrick Georgi
parent 9fd183efde
commit bbf2496493
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/devices/oprom/x86emu/ops.c
View File

@ -2058,27 +2058,29 @@ Handles opcode 0x8d
static void x86emuOp_lea_word_R_M(u8 X86EMU_UNUSED(op1)) static void x86emuOp_lea_word_R_M(u8 X86EMU_UNUSED(op1))
{ {
int mod, rl, rh; int mod, rl, rh;
u16 *srcreg;
uint destoffset; uint destoffset;
/*
* TODO: Need to handle address size prefix!
*
* lea eax,[eax+ebx*2] ??
*/
START_OF_INSTR(); START_OF_INSTR();
DECODE_PRINTF("LEA\t"); DECODE_PRINTF("LEA\t");
FETCH_DECODE_MODRM(mod, rh, rl); FETCH_DECODE_MODRM(mod, rh, rl);
if (mod < 3) { if (mod < 3) {
srcreg = DECODE_RM_WORD_REGISTER(rh); if (M.x86.mode & SYSMODE_PREFIX_ADDR) {
DECODE_PRINTF(","); u32 *srcreg = DECODE_RM_LONG_REGISTER(rh);
destoffset = decode_rmXX_address(mod, rl); DECODE_PRINTF(",");
DECODE_PRINTF("\n"); destoffset = decode_rmXX_address(mod, rl);
TRACE_AND_STEP(); DECODE_PRINTF("\n");
*srcreg = (u16)destoffset; TRACE_AND_STEP();
*srcreg = (u32)destoffset;
} else {
u16 *srcreg = DECODE_RM_WORD_REGISTER(rh);
DECODE_PRINTF(",");
destoffset = decode_rmXX_address(mod, rl);
DECODE_PRINTF("\n");
TRACE_AND_STEP();
*srcreg = (u16)destoffset;
} }
/* } else { undefined. Do nothing. } */ }
/* else { undefined. Do nothing. } */
DECODE_CLEAR_SEGOVR(); DECODE_CLEAR_SEGOVR();
END_OF_INSTR(); END_OF_INSTR();
} }