Revision 640f42e4 target-i386/helper.c
b/target-i386/helper.c | ||
---|---|---|
930 | 930 |
|
931 | 931 |
/* XXX: This value should match the one returned by CPUID |
932 | 932 |
* and in exec.c */ |
933 |
#if defined(USE_KQEMU)
|
|
933 |
#if defined(CONFIG_KQEMU)
|
|
934 | 934 |
#define PHYS_ADDR_MASK 0xfffff000LL |
935 | 935 |
#else |
936 | 936 |
# if defined(TARGET_X86_64) |
... | ... | |
1630 | 1630 |
/* XXX: This value must match the one used in the MMU code. */ |
1631 | 1631 |
if (env->cpuid_ext2_features & CPUID_EXT2_LM) { |
1632 | 1632 |
/* 64 bit processor */ |
1633 |
#if defined(USE_KQEMU)
|
|
1633 |
#if defined(CONFIG_KQEMU)
|
|
1634 | 1634 |
*eax = 0x00003020; /* 48 bits virtual, 32 bits physical */ |
1635 | 1635 |
#else |
1636 | 1636 |
/* XXX: The physical address space is limited to 42 bits in exec.c. */ |
1637 | 1637 |
*eax = 0x00003028; /* 48 bits virtual, 40 bits physical */ |
1638 | 1638 |
#endif |
1639 | 1639 |
} else { |
1640 |
#if defined(USE_KQEMU)
|
|
1640 |
#if defined(CONFIG_KQEMU)
|
|
1641 | 1641 |
*eax = 0x00000020; /* 32 bits physical */ |
1642 | 1642 |
#else |
1643 | 1643 |
if (env->cpuid_features & CPUID_PSE36) |
... | ... | |
1689 | 1689 |
return NULL; |
1690 | 1690 |
} |
1691 | 1691 |
cpu_reset(env); |
1692 |
#ifdef USE_KQEMU
|
|
1692 |
#ifdef CONFIG_KQEMU
|
|
1693 | 1693 |
kqemu_init(env); |
1694 | 1694 |
#endif |
1695 | 1695 |
if (kvm_enabled()) |
Also available in: Unified diff