mirror of https://github.com/proxmox/mirror_qemu
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-71466251a162master
parent
55489a1739
commit
de9a95f022
|
@ -1,9 +1,5 @@
|
||||||
include config.mak
|
include config.mak
|
||||||
|
|
||||||
ifndef CONFIG_DYNGEN_OP
|
|
||||||
CC=$(HOST_CC)
|
|
||||||
endif
|
|
||||||
|
|
||||||
TARGET_BASE_ARCH:=$(TARGET_ARCH)
|
TARGET_BASE_ARCH:=$(TARGET_ARCH)
|
||||||
ifeq ($(TARGET_ARCH), x86_64)
|
ifeq ($(TARGET_ARCH), x86_64)
|
||||||
TARGET_BASE_ARCH:=i386
|
TARGET_BASE_ARCH:=i386
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#ifndef _EXEC_ALL_H_
|
#ifndef _EXEC_ALL_H_
|
||||||
#define _EXEC_ALL_H_
|
#define _EXEC_ALL_H_
|
||||||
/* allow to see translation results - the slowdown should be negligible, so we leave it */
|
/* allow to see translation results - the slowdown should be negligible, so we leave it */
|
||||||
//#define DEBUG_DISAS
|
#define DEBUG_DISAS
|
||||||
|
|
||||||
/* is_jmp field values */
|
/* is_jmp field values */
|
||||||
#define DISAS_NEXT 0 /* next instruction can be analyzed */
|
#define DISAS_NEXT 0 /* next instruction can be analyzed */
|
||||||
|
|
|
@ -1059,7 +1059,7 @@ void pal_init (CPUState *env)
|
||||||
|
|
||||||
void call_pal (CPUState *env, int palcode)
|
void call_pal (CPUState *env, int palcode)
|
||||||
{
|
{
|
||||||
target_long ret;
|
target_ulong ret;
|
||||||
|
|
||||||
if (logfile != NULL)
|
if (logfile != NULL)
|
||||||
fprintf(logfile, "%s: palcode %02x\n", __func__, palcode);
|
fprintf(logfile, "%s: palcode %02x\n", __func__, palcode);
|
||||||
|
|
3
net.c
3
net.c
|
@ -622,8 +622,6 @@ static void tap_send(void *opaque)
|
||||||
|
|
||||||
/* fd support */
|
/* fd support */
|
||||||
|
|
||||||
void enable_sigio_timer(int fd);
|
|
||||||
|
|
||||||
static TAPState *net_tap_fd_init(VLANState *vlan, int fd)
|
static TAPState *net_tap_fd_init(VLANState *vlan, int fd)
|
||||||
{
|
{
|
||||||
TAPState *s;
|
TAPState *s;
|
||||||
|
@ -632,7 +630,6 @@ static TAPState *net_tap_fd_init(VLANState *vlan, int fd)
|
||||||
if (!s)
|
if (!s)
|
||||||
return NULL;
|
return NULL;
|
||||||
s->fd = fd;
|
s->fd = fd;
|
||||||
enable_sigio_timer(fd);
|
|
||||||
s->vc = qemu_new_vlan_client(vlan, tap_receive, NULL, s);
|
s->vc = qemu_new_vlan_client(vlan, tap_receive, NULL, s);
|
||||||
qemu_set_fd_handler(s->fd, tap_send, 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);
|
snprintf(s->vc->info_str, sizeof(s->vc->info_str), "tap: fd=%d", fd);
|
||||||
|
|
|
@ -3609,6 +3609,8 @@ static void gen_mtc0 (CPUState *env, DisasContext *ctx, TCGv t0, int reg, int se
|
||||||
default:
|
default:
|
||||||
goto die;
|
goto die;
|
||||||
}
|
}
|
||||||
|
/* Stop translation as we may have switched the execution mode */
|
||||||
|
ctx->bstate = BS_STOP;
|
||||||
break;
|
break;
|
||||||
case 12:
|
case 12:
|
||||||
switch (sel) {
|
switch (sel) {
|
||||||
|
@ -4791,6 +4793,8 @@ static void gen_dmtc0 (CPUState *env, DisasContext *ctx, TCGv t0, int reg, int s
|
||||||
default:
|
default:
|
||||||
goto die;
|
goto die;
|
||||||
}
|
}
|
||||||
|
/* Stop translation as we may have switched the execution mode */
|
||||||
|
ctx->bstate = BS_STOP;
|
||||||
break;
|
break;
|
||||||
case 12:
|
case 12:
|
||||||
switch (sel) {
|
switch (sel) {
|
||||||
|
|
Loading…
Reference in New Issue