From: Giacomo Travaglini Date: Mon, 23 Mar 2020 16:10:26 +0000 (+0000) Subject: arch-arm: Make load_addr_mask=0 for ArmFsLinux only X-Git-Tag: v20.0.0.0~272 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a1544d32e833eeba5b84115fb11a84068a4b7af6;p=gem5.git arch-arm: Make load_addr_mask=0 for ArmFsLinux only This is restoring the situaton pre: https://gem5-review.googlesource.com/c/public/gem5/+/26466 Where load_addr_mask was set to 0 (forcing the loader to discard the kernel entry point) for LinuxArmSystem only. With this patch the masking is done for ArmFsLinux workloads only and it is using the default 0xffffffffffffffff (no masking) for common ArmFsWorkload Change-Id: I68970edcac61ad0de79433ffd84fef580a94b480 Signed-off-by: Giacomo Travaglini Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27024 Tested-by: Gem5 Cloud Project GCB service account <345032938727@cloudbuild.gserviceaccount.com> Tested-by: kokoro Reviewed-by: Gabe Black --- diff --git a/src/arch/arm/ArmFsWorkload.py b/src/arch/arm/ArmFsWorkload.py index 6064d81e9..459f83095 100644 --- a/src/arch/arm/ArmFsWorkload.py +++ b/src/arch/arm/ArmFsWorkload.py @@ -50,8 +50,6 @@ class ArmFsWorkload(OsKernel): cxx_header = "arch/arm/fs_workload.hh" cxx_class = "ArmISA::FsWorkload" - load_addr_mask = 0 - boot_loader = VectorParam.String([], "File that contains the boot loader code. Zero or more files may be " "specified. The first boot loader that matches the kernel's " @@ -79,6 +77,8 @@ class ArmFsLinux(ArmFsWorkload): cxx_header = "arch/arm/linux/fs_workload.hh" cxx_class = "ArmISA::FsLinux" + load_addr_mask = 0 + @cxxMethod def dumpDmesg(self): """Dump dmesg from the simulated kernel to standard out"""