mirror of
https://github.com/tuz358/cpu-emulator.git
synced 2025-12-19 05:24:35 +03:00
Minor fixes
This commit is contained in:
@@ -350,7 +350,7 @@ void Instructions::adc_rm32_r32(){
|
|||||||
addr = this->registers[this->M];
|
addr = this->registers[this->M];
|
||||||
// dst : data of [M]
|
// dst : data of [M]
|
||||||
dst = memory.read_uint32(addr);
|
dst = memory.read_uint32(addr);
|
||||||
memory.write_uint32(addr, dst + this->registers[this->R] + CF);
|
memory.write_uint32(addr, dst + this->registers[this->R] + get_flag(CF));
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
// adc [M+imm8], R
|
// adc [M+imm8], R
|
||||||
@@ -360,7 +360,7 @@ void Instructions::adc_rm32_r32(){
|
|||||||
addr = this->registers[this->M];
|
addr = this->registers[this->M];
|
||||||
// dst : data of [M+imm8]
|
// dst : data of [M+imm8]
|
||||||
dst = memory.read_uint32(addr + imm8);
|
dst = memory.read_uint32(addr + imm8);
|
||||||
memory.write_uint32(addr + imm8, dst + this->registers[this->R] + CF);
|
memory.write_uint32(addr + imm8, dst + this->registers[this->R] + get_flag(CF));
|
||||||
this->eip++;
|
this->eip++;
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
@@ -372,14 +372,14 @@ void Instructions::adc_rm32_r32(){
|
|||||||
addr = this->registers[this->M];
|
addr = this->registers[this->M];
|
||||||
// dst : data of [M+imm32]
|
// dst : data of [M+imm32]
|
||||||
dst = memory.read_uint32(addr + imm32);
|
dst = memory.read_uint32(addr + imm32);
|
||||||
memory.write_uint32(addr, dst + this->registers[this->R] + CF);
|
memory.write_uint32(addr, dst + this->registers[this->R] + get_flag(CF));
|
||||||
this->eip += 4;
|
this->eip += 4;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
// case mod == 3
|
// case mod == 3
|
||||||
// adc M, R
|
// adc M, R
|
||||||
this->eip++;
|
this->eip++;
|
||||||
this->registers[this->M] += this->registers[this->R] + CF;
|
this->registers[this->M] += this->registers[this->R] + get_flag(CF);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -400,7 +400,7 @@ void Instructions::adc_r32_rm32(){
|
|||||||
addr = this->registers[this->M];
|
addr = this->registers[this->M];
|
||||||
// dst : data of [M]
|
// dst : data of [M]
|
||||||
dst = memory.read_uint32(addr);
|
dst = memory.read_uint32(addr);
|
||||||
this->registers[this->R] += dst + CF;
|
this->registers[this->R] += dst + get_flag(CF);
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
// adc R, [M+imm8]
|
// adc R, [M+imm8]
|
||||||
@@ -410,7 +410,7 @@ void Instructions::adc_r32_rm32(){
|
|||||||
addr = this->registers[this->M];
|
addr = this->registers[this->M];
|
||||||
// dst : data of [M+imm8]
|
// dst : data of [M+imm8]
|
||||||
dst = memory.read_uint32(addr + imm8);
|
dst = memory.read_uint32(addr + imm8);
|
||||||
this->registers[this->R] += dst + CF;
|
this->registers[this->R] += dst + get_flag(CF);
|
||||||
this->eip++;
|
this->eip++;
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
@@ -422,14 +422,14 @@ void Instructions::adc_r32_rm32(){
|
|||||||
addr = this->registers[this->M];
|
addr = this->registers[this->M];
|
||||||
// dst : data of [M+imm32]
|
// dst : data of [M+imm32]
|
||||||
dst = memory.read_uint32(addr + imm32);
|
dst = memory.read_uint32(addr + imm32);
|
||||||
this->registers[this->R] += dst + CF;
|
this->registers[this->R] += dst + get_flag(CF);
|
||||||
this->eip += 4;
|
this->eip += 4;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
// case mod == 3
|
// case mod == 3
|
||||||
// adc R, M
|
// adc R, M
|
||||||
this->eip++;
|
this->eip++;
|
||||||
this->registers[this->R] += this->registers[this->M] + CF;
|
this->registers[this->R] += this->registers[this->M] + get_flag(CF);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -438,7 +438,7 @@ void Instructions::adc_eax_imm32(){
|
|||||||
this->eip++;
|
this->eip++;
|
||||||
uint32_t imm32 = memory.read_uint32(this->eip);
|
uint32_t imm32 = memory.read_uint32(this->eip);
|
||||||
imm32 = swap_endian32(imm32);
|
imm32 = swap_endian32(imm32);
|
||||||
this->registers[0] += imm32 + CF;
|
this->registers[0] += imm32 + get_flag(CF);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Instructions::and_rm32_r32(){
|
void Instructions::and_rm32_r32(){
|
||||||
|
|||||||
Reference in New Issue
Block a user