diff options
| author | WANG Xuerui <xen0n@gentoo.org> | 2022-03-28 11:59:42 +0800 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2022-03-29 00:51:50 +0200 |
| commit | 8cd0e66353018f63322e0dd200b2d31be265f883 (patch) | |
| tree | d42f7a2dadf42b00b0fce747f29207a8fd45c9b2 | |
| parent | a8749d7cc9210ae76bb7032970ad8a208c67a1f2 (diff) | |
| download | qemu-8cd0e66353018f63322e0dd200b2d31be265f883.zip qemu-8cd0e66353018f63322e0dd200b2d31be265f883.tar.gz qemu-8cd0e66353018f63322e0dd200b2d31be265f883.tar.bz2 | |
target/mips: Fix address space range declaration on n32
This bug is probably lurking there for so long, I cannot even git-blame
my way to the commit first introducing it.
Anyway, because n32 is also TARGET_MIPS64, the address space range
cannot be determined by looking at TARGET_MIPS64 alone. Fix this by only
declaring 48-bit address spaces for n64, or the n32 user emulation will
happily hand out memory ranges beyond the 31-bit limit and crash.
Confirmed to make the minimal reproducing example in the linked issue
behave.
Closes: https://gitlab.com/qemu-project/qemu/-/issues/939
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
Signed-off-by: WANG Xuerui <xen0n@gentoo.org>
Tested-by: Andreas K. Huettel <dilfridge@gentoo.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220328035942.3299661-1-xen0n@gentoo.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
| -rw-r--r-- | target/mips/cpu-param.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/mips/cpu-param.h b/target/mips/cpu-param.h index 9c4a6ea..1aebd01 100644 --- a/target/mips/cpu-param.h +++ b/target/mips/cpu-param.h @@ -12,7 +12,7 @@ #else # define TARGET_LONG_BITS 32 #endif -#ifdef TARGET_MIPS64 +#ifdef TARGET_ABI_MIPSN64 #define TARGET_PHYS_ADDR_SPACE_BITS 48 #define TARGET_VIRT_ADDR_SPACE_BITS 48 #else |