Stowage/v86
2
0
Fork 0
mirror of https://github.com/copy/v86.git synced 2025-12-31 04:23:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

gen_pushf_popf_check

Browse source
This commit is contained in:
Fabian 2021-04-09 18:54:54 -05:00
parent d929f4d7fd
commit b48166280b
2 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/rust/cpu/instructions.rs
View file

@ -1105,11 +1105,10 @@ pub unsafe fn instr_9B() {
fwait();
};
}
#[no_mangle]
pub unsafe fn instr_9C_check() -> bool { 0 != *flags & FLAG_VM && getiopl() < 3 }
unsafe fn instr_pushf_popf_check() -> bool { 0 != *flags & FLAG_VM && getiopl() < 3 }
pub unsafe fn instr16_9C() {
// pushf
if instr_9C_check() {
if instr_pushf_popf_check() {
dbg_assert!(*protected_mode);
dbg_log!("pushf #gp");
trigger_gp(0);
@ -1120,7 +1119,7 @@ pub unsafe fn instr16_9C() {
}
pub unsafe fn instr32_9C() {
// pushf
if instr_9C_check() {
if instr_pushf_popf_check() {
// trap to virtual 8086 monitor
dbg_assert!(*protected_mode);
dbg_log!("pushf #gp");
@ -1134,7 +1133,7 @@ pub unsafe fn instr32_9C() {
pub unsafe fn instr16_9D() {
// popf
if 0 != *flags & FLAG_VM && getiopl() < 3 {
if instr_pushf_popf_check() {
dbg_log!("popf #gp");
trigger_gp(0);
return;
@ -1147,7 +1146,7 @@ pub unsafe fn instr16_9D() {
}
pub unsafe fn instr32_9D() {
// popf
if 0 != *flags & FLAG_VM && getiopl() < 3 {
if instr_pushf_popf_check() {
dbg_log!("popf #gp");
trigger_gp(0);
return;

23
src/rust/jit_instructions.rs
View file

@ -4,7 +4,7 @@ use codegen;
use codegen::BitSize;
use cpu::cpu::{
FLAGS_ALL, FLAGS_DEFAULT, FLAGS_MASK, FLAG_ADJUST, FLAG_CARRY, FLAG_DIRECTION, FLAG_INTERRUPT,
FLAG_OVERFLOW, FLAG_SUB, FLAG_ZERO, OPSIZE_8, OPSIZE_16, OPSIZE_32,
FLAG_IOPL, FLAG_OVERFLOW, FLAG_SUB, FLAG_VM, FLAG_ZERO, OPSIZE_8, OPSIZE_16, OPSIZE_32,
};
use cpu::global_pointers;
use jit::{Instruction, InstructionOperand, JitContext};
@ -4267,8 +4267,23 @@ pub fn instr32_99_jit(ctx: &mut JitContext) {
codegen::gen_set_reg32(ctx, regs::EDX);
}
fn gen_pushf_popf_check(ctx: &mut JitContext) {
// 0 != *flags & FLAG_VM && getiopl() < 3
codegen::gen_get_flags(ctx.builder);
ctx.builder.const_i32(FLAG_VM);
ctx.builder.and_i32();
ctx.builder.const_i32(FLAG_VM);
ctx.builder.eq_i32();
codegen::gen_get_flags(ctx.builder);
ctx.builder.const_i32(FLAG_IOPL);
ctx.builder.and_i32();
ctx.builder.const_i32(FLAG_IOPL);
ctx.builder.ne_i32();
ctx.builder.and_i32();
}
pub fn instr16_9C_jit(ctx: &mut JitContext) {
ctx.builder.call_fn0_ret("instr_9C_check");
gen_pushf_popf_check(ctx);
ctx.builder.if_void();
codegen::gen_trigger_gp(ctx, 0);
ctx.builder.else_();
@ -4279,7 +4294,7 @@ pub fn instr16_9C_jit(ctx: &mut JitContext) {
ctx.builder.free_local(value);
}
pub fn instr32_9C_jit(ctx: &mut JitContext) {
ctx.builder.call_fn0_ret("instr_9C_check");
gen_pushf_popf_check(ctx);
ctx.builder.if_void();
codegen::gen_trigger_gp(ctx, 0);
ctx.builder.else_();
@ -4293,7 +4308,7 @@ pub fn instr32_9C_jit(ctx: &mut JitContext) {
}
fn gen_popf(ctx: &mut JitContext, is_32: bool) {
ctx.builder.call_fn0_ret("instr_9C_check");
gen_pushf_popf_check(ctx);
ctx.builder.if_void();
codegen::gen_trigger_gp(ctx, 0);
ctx.builder.else_();