diff options
Diffstat (limited to 'src/sim')
| -rw-r--r-- | src/sim/System.py | 18 | ||||
| -rw-r--r-- | src/sim/system.cc | 10 |
2 files changed, 25 insertions, 3 deletions
diff --git a/src/sim/System.py b/src/sim/System.py index 68761384b..f45decb6b 100644 --- a/src/sim/System.py +++ b/src/sim/System.py @@ -1,3 +1,15 @@ +# Copyright (c) 2017 ARM Limited +# All rights reserved. +# +# The license below extends only to copyright in the software and shall +# not be construed as granting a license to any other intellectual +# property including but not limited to intellectual property relating +# to a hardware implementation of the functionality of the software +# licensed hereunder. You may use the software subject to the license +# terms below provided that you ensure that this notice is replicated +# unmodified and in its entirety in all distributions of the software, +# modified or unmodified, in source code or in binary form. +# # Copyright (c) 2005-2007 The Regents of The University of Michigan # Copyright (c) 2011 Regents of the University of California # All rights reserved. @@ -96,8 +108,10 @@ class System(MemObject): kernel_extras = VectorParam.String([],"Additional object files to load") readfile = Param.String("", "file to read startup script from") symbolfile = Param.String("", "file to get the symbols from") - load_addr_mask = Param.UInt64(0xffffffffff, - "Address to mask loading binaries with") + load_addr_mask = Param.UInt64(0xffffffffffffffff, + "Address to mask loading binaries with, if 0, system " + "auto-calculates the mask to be the most restrictive, " + "otherwise it obeys a custom mask.") load_offset = Param.UInt64(0, "Address to offset loading binaries with") multi_thread = Param.Bool(False, diff --git a/src/sim/system.cc b/src/sim/system.cc index 9d0b919ca..e720db07a 100644 --- a/src/sim/system.cc +++ b/src/sim/system.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2014 ARM Limited + * Copyright (c) 2011-2014,2017 ARM Limited * All rights reserved * * The license below extends only to copyright in the software and shall @@ -158,6 +158,14 @@ System::System(Params *p) kernelEnd = kernel->bssBase() + kernel->bssSize(); kernelEntry = kernel->entryPoint(); + // If load_addr_mask is set to 0x0, then auto-calculate + // the smallest mask to cover all kernel addresses so gem5 + // can relocate the kernel to a new offset. + if (loadAddrMask == 0) { + Addr shift_amt = findMsbSet(kernelEnd - kernelStart) + 1; + loadAddrMask = ((Addr)1 << shift_amt) - 1; + } + // load symbols if (!kernel->loadGlobalSymbols(kernelSymtab)) fatal("could not load kernel symbols\n"); |