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

diff --git a/Makefile.target b/Makefile.target
index 3019f44..031ab45 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -1,9 +1,5 @@
 include config.mak
 
-ifndef CONFIG_DYNGEN_OP
-CC=$(HOST_CC)
-endif
-
 TARGET_BASE_ARCH:=$(TARGET_ARCH)
 ifeq ($(TARGET_ARCH), x86_64)
 TARGET_BASE_ARCH:=i386

diff --git a/exec-all.h b/exec-all.h
index 95c10cd..e3da98a 100644 (file)
--- a/exec-all.h
+++ b/exec-all.h
@@ -21,7 +21,7 @@
 #ifndef _EXEC_ALL_H_
 #define _EXEC_ALL_H_
 /* allow to see translation results - the slowdown should be negligible, so we leave it */
-//#define DEBUG_DISAS
+#define DEBUG_DISAS
 
 /* is_jmp field values */
 #define DISAS_NEXT    0 /* next instruction can be analyzed */

diff --git a/hw/alpha_palcode.c b/hw/alpha_palcode.c
index 351bb48..38466db 100644 (file)
--- a/hw/alpha_palcode.c
+++ b/hw/alpha_palcode.c
@@ -1059,7 +1059,7 @@ void pal_init (CPUState *env)
 
 void call_pal (CPUState *env, int palcode)
 {
-    target_long ret;
+    target_ulong ret;
 
     if (logfile != NULL)
         fprintf(logfile, "%s: palcode %02x\n", __func__, palcode);

diff --git a/net.c b/net.c
index bb9ea6e..35aeb1e 100644 (file)
--- a/net.c
+++ b/net.c
@@ -622,8 +622,6 @@ static void tap_send(void *opaque)
 
 /* fd support */
 
-void enable_sigio_timer(int fd);
-
 static TAPState *net_tap_fd_init(VLANState *vlan, int fd)
 {
     TAPState *s;
@@ -632,7 +630,6 @@ static TAPState *net_tap_fd_init(VLANState *vlan, int fd)
     if (!s)
         return NULL;
     s->fd = fd;
-    enable_sigio_timer(fd);
     s->vc = qemu_new_vlan_client(vlan, tap_receive, NULL, s);
     qemu_set_fd_handler(s->fd, tap_send, NULL, s);
     snprintf(s->vc->info_str, sizeof(s->vc->info_str), "tap: fd=%d", fd);

diff --git a/target-mips/translate.c b/target-mips/translate.c
index 03f3fbb..386e0e3 100644 (file)
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -3609,6 +3609,8 @@ static void gen_mtc0 (CPUState *env, DisasContext *ctx, TCGv t0, int reg, int se
         default:
             goto die;
         }
+        /* Stop translation as we may have switched the execution mode */
+        ctx->bstate = BS_STOP;
         break;
     case 12:
         switch (sel) {
@@ -4791,6 +4793,8 @@ static void gen_dmtc0 (CPUState *env, DisasContext *ctx, TCGv t0, int reg, int s
         default:
             goto die;
         }
+        /* Stop translation as we may have switched the execution mode */
+        ctx->bstate = BS_STOP;
         break;
     case 12:
         switch (sel) {

diff --git a/vl.c b/vl.c
index 24c9c32..7bcffd3 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -1403,7 +1403,7 @@ static int fcntl_setfl(int fd, int flag)
 
 #define RTC_FREQ 1024
 
-void enable_sigio_timer(int fd)
+static void enable_sigio_timer(int fd)
 {
     struct sigaction act;