Commit de9a95f0223733a524e4955f1b4bdb938f79255b
1 parent
55489a17
Revert commits 5685 to 5688 committed by mistake
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5691 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
6 changed files
with
7 additions
and
10 deletions
Makefile.target
exec-all.h
| ... | ... | @@ -21,7 +21,7 @@ |
| 21 | 21 | #ifndef _EXEC_ALL_H_ |
| 22 | 22 | #define _EXEC_ALL_H_ |
| 23 | 23 | /* allow to see translation results - the slowdown should be negligible, so we leave it */ |
| 24 | -//#define DEBUG_DISAS | |
| 24 | +#define DEBUG_DISAS | |
| 25 | 25 | |
| 26 | 26 | /* is_jmp field values */ |
| 27 | 27 | #define DISAS_NEXT 0 /* next instruction can be analyzed */ | ... | ... |
hw/alpha_palcode.c
| ... | ... | @@ -1059,7 +1059,7 @@ void pal_init (CPUState *env) |
| 1059 | 1059 | |
| 1060 | 1060 | void call_pal (CPUState *env, int palcode) |
| 1061 | 1061 | { |
| 1062 | - target_long ret; | |
| 1062 | + target_ulong ret; | |
| 1063 | 1063 | |
| 1064 | 1064 | if (logfile != NULL) |
| 1065 | 1065 | fprintf(logfile, "%s: palcode %02x\n", __func__, palcode); | ... | ... |
net.c
| ... | ... | @@ -622,8 +622,6 @@ static void tap_send(void *opaque) |
| 622 | 622 | |
| 623 | 623 | /* fd support */ |
| 624 | 624 | |
| 625 | -void enable_sigio_timer(int fd); | |
| 626 | - | |
| 627 | 625 | static TAPState *net_tap_fd_init(VLANState *vlan, int fd) |
| 628 | 626 | { |
| 629 | 627 | TAPState *s; |
| ... | ... | @@ -632,7 +630,6 @@ static TAPState *net_tap_fd_init(VLANState *vlan, int fd) |
| 632 | 630 | if (!s) |
| 633 | 631 | return NULL; |
| 634 | 632 | s->fd = fd; |
| 635 | - enable_sigio_timer(fd); | |
| 636 | 633 | s->vc = qemu_new_vlan_client(vlan, tap_receive, NULL, s); |
| 637 | 634 | qemu_set_fd_handler(s->fd, tap_send, NULL, s); |
| 638 | 635 | snprintf(s->vc->info_str, sizeof(s->vc->info_str), "tap: fd=%d", fd); | ... | ... |
target-mips/translate.c
| ... | ... | @@ -3609,6 +3609,8 @@ static void gen_mtc0 (CPUState *env, DisasContext *ctx, TCGv t0, int reg, int se |
| 3609 | 3609 | default: |
| 3610 | 3610 | goto die; |
| 3611 | 3611 | } |
| 3612 | + /* Stop translation as we may have switched the execution mode */ | |
| 3613 | + ctx->bstate = BS_STOP; | |
| 3612 | 3614 | break; |
| 3613 | 3615 | case 12: |
| 3614 | 3616 | switch (sel) { |
| ... | ... | @@ -4791,6 +4793,8 @@ static void gen_dmtc0 (CPUState *env, DisasContext *ctx, TCGv t0, int reg, int s |
| 4791 | 4793 | default: |
| 4792 | 4794 | goto die; |
| 4793 | 4795 | } |
| 4796 | + /* Stop translation as we may have switched the execution mode */ | |
| 4797 | + ctx->bstate = BS_STOP; | |
| 4794 | 4798 | break; |
| 4795 | 4799 | case 12: |
| 4796 | 4800 | switch (sel) { | ... | ... |