after closer review, in x64 the the op size is 32 so data32 is set, can removed the unicorn dependency and regress/fpu_ip64.py still works

This commit is contained in:
mothran 2015-08-30 18:04:28 -07:00
parent 2febbb6021
commit 912faf2c3c

View file

@ -986,18 +986,7 @@ void helper_fstenv(CPUX86State *env, target_ulong ptr, int data32)
} }
} }
} }
switch (env->uc->mode) { if (data32) {
case (UC_MODE_64):
/* 64 bit */
cpu_stl_data(env, ptr, env->fpuc);
cpu_stl_data(env, ptr + 4, fpus);
cpu_stl_data(env, ptr + 8, fptag);
cpu_stl_data(env, ptr + 12, env->fpip); /* fpip */
cpu_stl_data(env, ptr + 20, 0); /* fpcs */
cpu_stl_data(env, ptr + 24, 0); /* fpoo */
cpu_stl_data(env, ptr + 28, 0); /* fpos */
break;
case (UC_MODE_32):
/* 32 bit */ /* 32 bit */
cpu_stl_data(env, ptr, env->fpuc); cpu_stl_data(env, ptr, env->fpuc);
cpu_stl_data(env, ptr + 4, fpus); cpu_stl_data(env, ptr + 4, fpus);
@ -1006,19 +995,15 @@ void helper_fstenv(CPUX86State *env, target_ulong ptr, int data32)
cpu_stl_data(env, ptr + 16, 0); /* fpcs */ cpu_stl_data(env, ptr + 16, 0); /* fpcs */
cpu_stl_data(env, ptr + 20, 0); /* fpoo */ cpu_stl_data(env, ptr + 20, 0); /* fpoo */
cpu_stl_data(env, ptr + 24, 0); /* fpos */ cpu_stl_data(env, ptr + 24, 0); /* fpos */
break; } else {
case (UC_MODE_16):
/* 16 bit */ /* 16 bit */
cpu_stw_data(env, ptr, env->fpuc); cpu_stw_data(env, ptr, env->fpuc);
cpu_stw_data(env, ptr + 2, fpus); cpu_stw_data(env, ptr + 2, fpus);
cpu_stw_data(env, ptr + 4, fptag); cpu_stw_data(env, ptr + 4, fptag);
cpu_stw_data(env, ptr + 6, 0); cpu_stw_data(env, ptr + 6, env->fpip);
cpu_stw_data(env, ptr + 8, 0); cpu_stw_data(env, ptr + 8, 0);
cpu_stw_data(env, ptr + 10, 0); cpu_stw_data(env, ptr + 10, 0);
cpu_stw_data(env, ptr + 12, 0); cpu_stw_data(env, ptr + 12, 0);
break;
default:
break;
} }
} }