falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 's390-1.0' of git://repo.or.cz/qemu/agraf

This commit is contained in:
Justin M. Forbes 2012-02-01 11:25:23 -06:00
parent 102dd9167c d194ba1cdb
commit 86a8d63bc1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target-s390x/kvm.c
View File

@ -185,9 +185,6 @@ void kvm_s390_interrupt_internal(CPUState *env, int type, uint32_t parm,
return; return;
} }
s390_add_running_cpu(env);
qemu_cpu_kick(env);
kvmint.type = type; kvmint.type = type;
kvmint.parm = parm; kvmint.parm = parm;
kvmint.parm64 = parm64; kvmint.parm64 = parm64;

3
target-s390x/op_helper.c
View File

@ -636,6 +636,9 @@ uint32_t HELPER(ex)(uint32_t cc, uint64_t v1, uint64_t addr, uint64_t ret)
case 0x700: case 0x700:
cc = helper_xc(l, get_address(0, b1, d1), get_address(0, b2, d2)); cc = helper_xc(l, get_address(0, b1, d1), get_address(0, b2, d2));
break; break;
case 0xc00:
helper_tr(l, get_address(0, b1, d1), get_address(0, b2, d2));
break;
default: default:
goto abort; goto abort;
break; break;