[Qemu-devel] [5691] Revert commits 5685 to 5688 committed by mistake

[Aurelien Jarno]

Revision: 5691
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5691
Author:   aurel32
Date:     2008-11-11 13:41:01 +0000 (Tue, 11 Nov 2008)

Log Message:
-----------
Revert commits 5685 to 5688 committed by mistake

Signed-off-by: Aurelien Jarno <address@hidden>

Modified Paths:
--------------
    trunk/Makefile.target
    trunk/exec-all.h
    trunk/hw/alpha_palcode.c
    trunk/net.c
    trunk/target-mips/translate.c
    trunk/vl.c

Modified: trunk/Makefile.target
===================================================================
--- trunk/Makefile.target       2008-11-11 13:31:10 UTC (rev 5690)
+++ trunk/Makefile.target       2008-11-11 13:41:01 UTC (rev 5691)
@@ -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

Modified: trunk/exec-all.h
===================================================================
--- trunk/exec-all.h    2008-11-11 13:31:10 UTC (rev 5690)
+++ trunk/exec-all.h    2008-11-11 13:41:01 UTC (rev 5691)
@@ -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 */

Modified: trunk/hw/alpha_palcode.c
===================================================================
--- trunk/hw/alpha_palcode.c    2008-11-11 13:31:10 UTC (rev 5690)
+++ trunk/hw/alpha_palcode.c    2008-11-11 13:41:01 UTC (rev 5691)
@@ -1059,7 +1059,7 @@
 
 void call_pal (CPUState *env, int palcode)
 {
-    target_long ret;
+    target_ulong ret;
 
     if (logfile != NULL)
         fprintf(logfile, "%s: palcode %02x\n", __func__, palcode);

Modified: trunk/net.c
===================================================================
--- trunk/net.c 2008-11-11 13:31:10 UTC (rev 5690)
+++ trunk/net.c 2008-11-11 13:41:01 UTC (rev 5691)
@@ -622,8 +622,6 @@
 
 /* fd support */
 
-void enable_sigio_timer(int fd);
-
 static TAPState *net_tap_fd_init(VLANState *vlan, int fd)
 {
     TAPState *s;
@@ -632,7 +630,6 @@
     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);

Modified: trunk/target-mips/translate.c
===================================================================
--- trunk/target-mips/translate.c       2008-11-11 13:31:10 UTC (rev 5690)
+++ trunk/target-mips/translate.c       2008-11-11 13:41:01 UTC (rev 5691)
@@ -3609,6 +3609,8 @@
         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 @@
         default:
             goto die;
         }
+        /* Stop translation as we may have switched the execution mode */
+        ctx->bstate = BS_STOP;
         break;
     case 12:
         switch (sel) {

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c  2008-11-11 13:31:10 UTC (rev 5690)
+++ trunk/vl.c  2008-11-11 13:41:01 UTC (rev 5691)
@@ -1403,7 +1403,7 @@
 
 #define RTC_FREQ 1024
 
-void enable_sigio_timer(int fd)
+static void enable_sigio_timer(int fd)
 {
     struct sigaction act;