mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(cpu64) Merged data_xfer8.cc

Browse Source
This commit is contained in:
Kevin Lawton 2002-09-13 21:47:21 +00:00
parent 9393b0046c
commit b9212fdafb
2 changed files with 19 additions and 19 deletions

2
bochs/cpu/Makefile.in

@ -66,7 +66,6 @@ OBJS32 = \
data_xfer32.o \ data_xfer32.o \
logical32.o \ logical32.o \
stack32.o \ stack32.o \
data_xfer8.o \
logical8.o \ logical8.o \
ctrl_xfer8.o \ ctrl_xfer8.o \
arith16.o \ arith16.o \
@ -103,6 +102,7 @@ OBJSXX = \
protect_ctrl.o \ protect_ctrl.o \
protect_ctrl_pro.o \ protect_ctrl_pro.o \
mult8.o \ mult8.o \
data_xfer8.o \
# Objects which are only used for x86-64 code, but which have been # Objects which are only used for x86-64 code, but which have been

36
bochs/cpu/data_xfer8.cc

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: data_xfer8.cc,v 1.6 2002-09-06 21:54:57 kevinlawton Exp $ // $Id: data_xfer8.cc,v 1.7 2002-09-13 21:47:21 kevinlawton Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2001 MandrakeSoft S.A.
@ -53,11 +53,11 @@ BX_CPU_C::MOV_EbGb(BxInstruction_t *i)
Bit8u op2; Bit8u op2;
/* op2 is a register, op2_addr is an index of a register */ /* op2 is a register, op2_addr is an index of a register */
op2 = BX_READ_8BIT_REG(i->nnn); op2 = BX_READ_8BIT_REGx(i->nnn,i->extend8bit);
/* now write op2 to op1 */ /* now write op2 to op1 */
if (i->mod == 0xc0) { if (i->mod == 0xc0) {
BX_WRITE_8BIT_REG(i->rm, op2); BX_WRITE_8BIT_REGx(i->rm, i->extend8bit, op2);
} }
else { else {
write_virtual_byte(i->seg, i->rm_addr, &op2); write_virtual_byte(i->seg, i->rm_addr, &op2);
@ -71,14 +71,14 @@ BX_CPU_C::MOV_GbEb(BxInstruction_t *i)
Bit8u op2; Bit8u op2;
if (i->mod == 0xc0) { if (i->mod == 0xc0) {
op2 = BX_READ_8BIT_REG(i->rm); op2 = BX_READ_8BIT_REGx(i->rm,i->extend8bit);
} }
else { else {
/* pointer, segment address pair */ /* pointer, segment address pair */
read_virtual_byte(i->seg, i->rm_addr, &op2); read_virtual_byte(i->seg, i->rm_addr, &op2);
} }
BX_WRITE_8BIT_REG(i->nnn, op2); BX_WRITE_8BIT_REGx(i->nnn, i->extend8bit, op2);
} }
@ -87,16 +87,16 @@ BX_CPU_C::MOV_GbEb(BxInstruction_t *i)
BX_CPU_C::MOV_ALOb(BxInstruction_t *i) BX_CPU_C::MOV_ALOb(BxInstruction_t *i)
{ {
Bit8u temp_8; Bit8u temp_8;
Bit32u addr_32; bx_address addr;
addr_32 = i->Id; addr = i->Id;
/* read from memory address */ /* read from memory address */
if (!BX_NULL_SEG_REG(i->seg)) { if (!BX_NULL_SEG_REG(i->seg)) {
read_virtual_byte(i->seg, addr_32, &temp_8); read_virtual_byte(i->seg, addr, &temp_8);
} }
else { else {
read_virtual_byte(BX_SEG_REG_DS, addr_32, &temp_8); read_virtual_byte(BX_SEG_REG_DS, addr, &temp_8);
} }
@ -109,19 +109,19 @@ BX_CPU_C::MOV_ALOb(BxInstruction_t *i)
BX_CPU_C::MOV_ObAL(BxInstruction_t *i) BX_CPU_C::MOV_ObAL(BxInstruction_t *i)
{ {
Bit8u temp_8; Bit8u temp_8;
Bit32u addr_32; bx_address addr;
addr_32 = i->Id; addr = i->Id;
/* read from register */ /* read from register */
temp_8 = AL; temp_8 = AL;
/* write to memory address */ /* write to memory address */
if (!BX_NULL_SEG_REG(i->seg)) { if (!BX_NULL_SEG_REG(i->seg)) {
write_virtual_byte(i->seg, addr_32, &temp_8); write_virtual_byte(i->seg, addr, &temp_8);
} }
else { else {
write_virtual_byte(BX_SEG_REG_DS, addr_32, &temp_8); write_virtual_byte(BX_SEG_REG_DS, addr, &temp_8);
} }
} }
@ -135,7 +135,7 @@ BX_CPU_C::MOV_EbIb(BxInstruction_t *i)
/* now write op2 back to destination */ /* now write op2 back to destination */
if (i->mod == 0xc0) { if (i->mod == 0xc0) {
BX_WRITE_8BIT_REG(i->rm, op2); BX_WRITE_8BIT_REGx(i->rm, i->extend8bit, op2);
} }
else { else {
write_virtual_byte(i->seg, i->rm_addr, &op2); write_virtual_byte(i->seg, i->rm_addr, &op2);
@ -176,12 +176,12 @@ BX_CPU_C::XCHG_EbGb(BxInstruction_t *i)
Bit8u op2, op1; Bit8u op2, op1;
/* op2 is a register, op2_addr is an index of a register */ /* op2 is a register, op2_addr is an index of a register */
op2 = BX_READ_8BIT_REG(i->nnn); op2 = BX_READ_8BIT_REGx(i->nnn,i->extend8bit);
/* op1 is a register or memory reference */ /* op1 is a register or memory reference */
if (i->mod == 0xc0) { if (i->mod == 0xc0) {
op1 = BX_READ_8BIT_REG(i->rm); op1 = BX_READ_8BIT_REGx(i->rm,i->extend8bit);
BX_WRITE_8BIT_REG(i->rm, op2); BX_WRITE_8BIT_REGx(i->rm, i->extend8bit, op2);
} }
else { else {
/* pointer, segment address pair */ /* pointer, segment address pair */
@ -189,5 +189,5 @@ BX_CPU_C::XCHG_EbGb(BxInstruction_t *i)
Write_RMW_virtual_byte(op2); Write_RMW_virtual_byte(op2);
} }
BX_WRITE_8BIT_REG(i->nnn, op1); BX_WRITE_8BIT_REGx(i->nnn, i->extend8bit, op1);
} }