diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2011-05-23 22:33:39 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2011-05-23 22:33:39 +0200 |
| commit | 05c8a1e423736006580e4dd2bd94d0faafc9afdc (patch) | |
| tree | 490e0cb3eb784244bba388cb1890584a32dbf160 /exec-all.h | |
| parent | dcfd14b3741983c466ad92fa2ae91eeafce3e5d5 (diff) | |
| parent | fb8b273579eaa1e6cee4017e4b23104e17a36f07 (diff) | |
Merge branch 's390-next' of git://repo.or.cz/qemu/agraf
* 's390-next' of git://repo.or.cz/qemu/agraf:
s390x: complain when allocating ram fails
s390x: fix memory detection for guests > 64GB
s390x: change mapping base to allow guests > 2GB
s390x: Fix debugging for unknown sigp order codes
s390x: build s390x by default
s390x: remove compatibility cc field
s390x: Adjust GDB stub
s390x: translate engine for s390x CPU
s390x: Adjust internal kvm code
s390x: Implement opcode helpers
s390x: helper functions for system emulation
s390x: Shift variables in CPUState for memset(0)
s390x: keep hint on virtio managing size
s390x: make kvm exported functions conditional on kvm
s390x: s390x-linux-user support
tcg: extend max tcg opcodes when using 64-on-32bit
s390x: fix smp support for kvm
Diffstat (limited to 'exec-all.h')
| -rw-r--r-- | exec-all.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/exec-all.h b/exec-all.h index cf3a704e6d..026864e908 100644 --- a/exec-all.h +++ b/exec-all.h @@ -43,7 +43,11 @@ typedef ram_addr_t tb_page_addr_t; typedef struct TranslationBlock TranslationBlock; /* XXX: make safe guess about sizes */ +#if (HOST_LONG_BITS == 32) && (TARGET_LONG_BITS == 64) +#define MAX_OP_PER_INSTR 128 +#else #define MAX_OP_PER_INSTR 96 +#endif #if HOST_LONG_BITS == 32 #define MAX_OPC_PARAM_PER_ARG 2 |