Commit facc68be25927d95dda2f0248ab66daa990e997d
1 parent
3ff0631e
removed x86 hacks
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@377 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
3 additions
and
17 deletions
cpu-exec.c
| @@ -268,17 +268,7 @@ int cpu_exec(CPUState *env1) | @@ -268,17 +268,7 @@ int cpu_exec(CPUState *env1) | ||
| 268 | tb->tc_ptr = tc_ptr; | 268 | tb->tc_ptr = tc_ptr; |
| 269 | tb->cs_base = (unsigned long)cs_base; | 269 | tb->cs_base = (unsigned long)cs_base; |
| 270 | tb->flags = flags; | 270 | tb->flags = flags; |
| 271 | - ret = cpu_gen_code(env, tb, CODE_GEN_MAX_SIZE, &code_gen_size); | ||
| 272 | -#if defined(TARGET_I386) | ||
| 273 | - /* XXX: suppress that, this is incorrect */ | ||
| 274 | - /* if invalid instruction, signal it */ | ||
| 275 | - if (ret != 0) { | ||
| 276 | - /* NOTE: the tb is allocated but not linked, so we | ||
| 277 | - can leave it */ | ||
| 278 | - spin_unlock(&tb_lock); | ||
| 279 | - raise_exception(EXCP06_ILLOP); | ||
| 280 | - } | ||
| 281 | -#endif | 271 | + cpu_gen_code(env, tb, CODE_GEN_MAX_SIZE, &code_gen_size); |
| 282 | *ptb = tb; | 272 | *ptb = tb; |
| 283 | tb->hash_next = NULL; | 273 | tb->hash_next = NULL; |
| 284 | tb_link(tb); | 274 | tb_link(tb); |
| @@ -295,12 +285,8 @@ int cpu_exec(CPUState *env1) | @@ -295,12 +285,8 @@ int cpu_exec(CPUState *env1) | ||
| 295 | #ifdef __sparc__ | 285 | #ifdef __sparc__ |
| 296 | T0 = tmp_T0; | 286 | T0 = tmp_T0; |
| 297 | #endif | 287 | #endif |
| 298 | - /* see if we can patch the calling TB. XXX: remove TF test */ | ||
| 299 | - if (T0 != 0 | ||
| 300 | -#if defined(TARGET_I386) | ||
| 301 | - && !(env->eflags & TF_MASK) | ||
| 302 | -#endif | ||
| 303 | - ) { | 288 | + /* see if we can patch the calling TB. */ |
| 289 | + if (T0 != 0) { | ||
| 304 | spin_lock(&tb_lock); | 290 | spin_lock(&tb_lock); |
| 305 | tb_add_jump((TranslationBlock *)(T0 & ~3), T0 & 3, tb); | 291 | tb_add_jump((TranslationBlock *)(T0 & ~3), T0 & 3, tb); |
| 306 | spin_unlock(&tb_lock); | 292 | spin_unlock(&tb_lock); |